Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Fix segfault in ccurl_thread.c

Browse Source 
curl_global_init() is not thread-safe, it must be called at the start of main()
This commit is contained in:
Pavel Labath 2010-08-29 13:31:18 +02:00
parent dadc49b09f
commit 3f7be35406
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ccurl_thread.c
View File

@ -122,35 +122,32 @@ void ccurl_fetch_data(ccurl_location_t *curloc)
chunk.memory = NULL; chunk.memory = NULL;
chunk.size = 0; chunk.size = 0;
if (curl_global_init(CURL_GLOBAL_ALL) == 0) { curl = curl_easy_init();
curl = curl_easy_init(); if (curl) {
if (curl) { DBGP("reading curl data from '%s'", curloc->uri);
DBGP("reading curl data from '%s'", curloc->uri); curl_easy_setopt(curl, CURLOPT_URL, curloc->uri);
curl_easy_setopt(curl, CURLOPT_URL, curloc->uri); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ccurl_write_memory_callback);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ccurl_write_memory_callback); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &chunk);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &chunk); curl_easy_setopt(curl, CURLOPT_USERAGENT, "conky-curl/1.0");
curl_easy_setopt(curl, CURLOPT_USERAGENT, "conky-curl/1.0");
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
if (res == CURLE_OK && chunk.size) { if (res == CURLE_OK && chunk.size) {
long http_status_code; long http_status_code;
if(curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_status_code) == CURLE_OK && http_status_code == 200) { if(curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_status_code) == CURLE_OK && http_status_code == 200) {
timed_thread_lock(curloc->p_timed_thread); timed_thread_lock(curloc->p_timed_thread);
(*curloc->process_function)(curloc->result, chunk.memory); (*curloc->process_function)(curloc->result, chunk.memory);
timed_thread_unlock(curloc->p_timed_thread); timed_thread_unlock(curloc->p_timed_thread);
} else {
NORM_ERR("curl: no data from server");
}
free(chunk.memory);
} else { } else {
NORM_ERR("curl: no data from server"); NORM_ERR("curl: no data from server");
} }
free(chunk.memory);
curl_easy_cleanup(curl); } else {
NORM_ERR("curl: no data from server");
} }
curl_global_cleanup();
curl_easy_cleanup(curl);
} }
} }

12
src/conky.c
View File

@ -70,6 +70,9 @@
#ifdef XOAP #ifdef XOAP
#include <libxml/parser.h> #include <libxml/parser.h>
#endif /* XOAP */ #endif /* XOAP */
#ifdef HAVE_CURL
#include <curl/curl.h>
#endif
/* local headers */ /* local headers */
#include "core.h" #include "core.h"
@ -5894,6 +5897,11 @@ int main(int argc, char **argv)
tcp_portmon_set_max_connections(0); tcp_portmon_set_max_connections(0);
#endif #endif
#ifdef HAVE_CURL
if(curl_global_init(CURL_GLOBAL_ALL))
NORM_ERR("curl_global_init() failed, you may not be able to use curl variables");
#endif
/* handle command line parameters that don't change configs */ /* handle command line parameters that don't change configs */
#ifdef X11 #ifdef X11
if (((s = getenv("LC_ALL")) && *s) || ((s = getenv("LC_CTYPE")) && *s) if (((s = getenv("LC_ALL")) && *s) || ((s = getenv("LC_CTYPE")) && *s)
@ -5985,6 +5993,10 @@ int main(int argc, char **argv)
main_loop(); main_loop();
#ifdef HAVE_CURL
curl_global_cleanup();
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
kvm_close(kd); kvm_close(kd);
#endif #endif