deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-15 18:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid direct use of libproxy

Browse Source 
Since hexchat already depends on GLib, it's better to use GProxyResolver
instead. This might use libproxy, or not, as appropriate.

P.S. This removes a memory safety issue because proxy_list is allocated
using malloc(), not g_malloc(), and therefore using g_strfreev() is
incorrect. The proper way to free the proxy list returned by libproxy
is to use px_proxy_factory_free_proxies() (but nobody does that because
it was added in libproxy 0.4.16, which is somewhat recent).
This commit is contained in:
Michael Catanzaro
2021-07-12 08:38:02 -05:00
committed by Patrick
parent 869a8d7ab3
commit 25440a07c3
6 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/hexchat.c
View File

@@ -57,10 +57,6 @@
#include <glib-object.h> /* for g_type_init() */
#endif
#ifdef USE_LIBPROXY
#include <proxy.h>
#endif
GSList *popup_list = 0;
GSList *button_list = 0;
GSList *dlgbutton_list = 0;
@@ -111,10 +107,6 @@ struct session *current_tab;
struct session *current_sess = 0;
struct hexchatprefs prefs;
#ifdef USE_LIBPROXY
pxProxyFactory *libproxy_factory;
#endif
/*
* Update the priority queue of the "interesting sessions"
* (sess_list_by_lastact).
@@ -1102,10 +1094,6 @@ main (int argc, char *argv[])
hexchat_remote ();
#endif
#ifdef USE_LIBPROXY
libproxy_factory = px_proxy_factory_new ();
#endif
#ifdef WIN32
coinit_result = CoInitializeEx (NULL, COINIT_APARTMENTTHREADED);
if (SUCCEEDED (coinit_result))
@@ -1148,10 +1136,6 @@ main (int argc, char *argv[])
}
#endif
#ifdef USE_LIBPROXY
px_proxy_factory_free (libproxy_factory);
#endif
#ifdef WIN32
WSACleanup ();
#endif