Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-27 17:18:33 +00:00
Code Issues Releases Activity

Fix segfault and memleaks in curl

Browse Source
This commit is contained in:
Nikolas Garofil 2009-11-08 21:49:28 +01:00
parent 3e4a2cf74e
commit e292dd5e28
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/ccurl_thread.c
View File

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