Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set CURLOPT_NOSIGNAL to 1

Browse Source 
prevent segfaults if timeout was reached in curl connection
This commit is contained in:
Andrzej Rybczak
2009-01-28 18:52:10 +01:00
parent 5b5d33c642
commit b2d3fef275
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lyrics.cpp
View File

@@ -119,6 +119,7 @@ void * GetArtistInfo(void *ptr)
curl_easy_setopt(info, CURLOPT_WRITEFUNCTION, write_data); curl_easy_setopt(info, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(info, CURLOPT_WRITEDATA, &result); curl_easy_setopt(info, CURLOPT_WRITEDATA, &result);
curl_easy_setopt(info, CURLOPT_CONNECTTIMEOUT, 10); curl_easy_setopt(info, CURLOPT_CONNECTTIMEOUT, 10);
curl_easy_setopt(info, CURLOPT_NOSIGNAL, 1);
code = curl_easy_perform(info); code = curl_easy_perform(info);
curl_easy_cleanup(info); curl_easy_cleanup(info);
pthread_mutex_unlock(&curl); pthread_mutex_unlock(&curl);
@@ -296,6 +297,7 @@ void *GetLyrics(void *song)
curl_easy_setopt(lyrics, CURLOPT_WRITEFUNCTION, write_data); curl_easy_setopt(lyrics, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(lyrics, CURLOPT_WRITEDATA, &result); curl_easy_setopt(lyrics, CURLOPT_WRITEDATA, &result);
curl_easy_setopt(lyrics, CURLOPT_CONNECTTIMEOUT, 10); curl_easy_setopt(lyrics, CURLOPT_CONNECTTIMEOUT, 10);
curl_easy_setopt(lyrics, CURLOPT_NOSIGNAL, 1);
code = curl_easy_perform(lyrics); code = curl_easy_perform(lyrics);
curl_easy_cleanup(lyrics); curl_easy_cleanup(lyrics);
pthread_mutex_unlock(&curl); pthread_mutex_unlock(&curl);