Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-03 17:39:27 +02:00
Code Issues Projects Releases Wiki Activity

2018-08-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in 'RDAudioExport' that caused a segfault.
This commit is contained in:
Fred Gleason 2018-08-03 13:52:28 -04:00
parent 2ff823235b
commit fac249d672
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17314,3 +17314,5 @@
2018-08-03 Fred Gleason <fredg@paravelsystems.com> 2018-08-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs in CDDB lookup code that caused corruption when processing * Fixed bugs in CDDB lookup code that caused corruption when processing
UTF-8 strings. UTF-8 strings.
2018-08-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'RDAudioExport' that caused a segfault.

8
lib/rdaudioexport.cpp
View File

@ -201,6 +201,7 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username,
} }
if((f=fopen(conv_dst_filename,"w"))==NULL) { if((f=fopen(conv_dst_filename,"w"))==NULL) {
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_formfree(first);
return RDAudioExport::ErrorNoDestination; return RDAudioExport::ErrorNoDestination;
} }
// //
@ -212,8 +213,6 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username,
curl_easy_setopt(curl,CURLOPT_URL,url); curl_easy_setopt(curl,CURLOPT_URL,url);
curl_easy_setopt(curl,CURLOPT_HTTPPOST,first); curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
curl_easy_setopt(curl,CURLOPT_WRITEDATA,f); curl_easy_setopt(curl,CURLOPT_WRITEDATA,f);
// curl_easy_setopt(curl,CURLOPT_POST,1);
// curl_easy_setopt(curl,CURLOPT_POSTFIELDS,(const char *)post);
curl_easy_setopt(curl,CURLOPT_USERAGENT, curl_easy_setopt(curl,CURLOPT_USERAGENT,
(const char *)rda->config()->userAgent()); (const char *)rda->config()->userAgent());
curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT); curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT);
@ -255,12 +254,11 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username,
} }
curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code); curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_formfree(first);
fclose(f); fclose(f);
if(response_code==200) { if(response_code==200) {
*conv_err=RDAudioConvert::ErrorOk; *conv_err=RDAudioConvert::ErrorOk;
curl_easy_cleanup(curl);
curl_formfree(first);
return RDAudioExport::ErrorOk; return RDAudioExport::ErrorOk;
} }
@ -280,8 +278,6 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username,
default: default:
ret=RDAudioExport::ErrorConverter; ret=RDAudioExport::ErrorConverter;
} }
curl_easy_cleanup(curl);
curl_formfree(first);
unlink(conv_dst_filename); unlink(conv_dst_filename);
return ret; return ret;