From b2d3fef275fd719751856c37bca26662d64e2df3 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 28 Jan 2009 18:52:10 +0100 Subject: [PATCH] set CURLOPT_NOSIGNAL to 1 prevent segfaults if timeout was reached in curl connection --- src/lyrics.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lyrics.cpp b/src/lyrics.cpp index 375c2c69..8ef6b08c 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -119,6 +119,7 @@ void * GetArtistInfo(void *ptr) curl_easy_setopt(info, CURLOPT_WRITEFUNCTION, write_data); curl_easy_setopt(info, CURLOPT_WRITEDATA, &result); curl_easy_setopt(info, CURLOPT_CONNECTTIMEOUT, 10); + curl_easy_setopt(info, CURLOPT_NOSIGNAL, 1); code = curl_easy_perform(info); curl_easy_cleanup(info); 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_WRITEDATA, &result); curl_easy_setopt(lyrics, CURLOPT_CONNECTTIMEOUT, 10); + curl_easy_setopt(lyrics, CURLOPT_NOSIGNAL, 1); code = curl_easy_perform(lyrics); curl_easy_cleanup(lyrics); pthread_mutex_unlock(&curl);