Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-09 14:33:28 +02:00
Code Issues Projects Releases Wiki Activity

2018-07-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'RDAudioExport', 'RDAudioImport',
	'RDAudioStore', 'RDCart', 'RDCopyAudio', 'RDPeakExport',
	'RDRehash', and 'RDTrimAudio' that caused credentials encoded in
	UTF-8 to be corrupted.
This commit is contained in:
Fred Gleason 2018-07-30 14:47:40 -04:00
parent 9769324828
commit ad639bc79e
10 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -17277,4 +17277,9 @@
'RDUpload' to work properly with credentials using UTF-8 strings.
2018-07-30 Fred Gleason <fredg@paravelsystems.com>
* Refactored ripcd(8) to process UTF-8 strings correctly.
* Fixed bugs in 'RDRip' that caused corruption of UTF-8 strings.
* Fixed bugs in 'RDRipc' that caused corruption of UTF-8 strings.
2018-07-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDAudioExport', 'RDAudioImport',
'RDAudioStore', 'RDCart', 'RDCopyAudio', 'RDPeakExport',
'RDRehash', and 'RDTrimAudio' that caused credentials encoded in
UTF-8 to be corrupted.

4
lib/rdaudioexport.cpp
View File

@ -147,9 +147,9 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_EXPORT),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_cart_number),

4
lib/rdaudioimport.cpp
View File

@ -127,9 +127,9 @@ RDAudioImport::ErrorCode RDAudioImport::runImport(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_IMPORT),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_cart_number),

4
lib/rdaudioinfo.cpp
View File

@ -126,9 +126,9 @@ RDAudioInfo::ErrorCode RDAudioInfo::runInfo(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_AUDIOINFO),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_cart_number),

4
lib/rdaudiostore.cpp
View File

@ -85,9 +85,9 @@ RDAudioStore::ErrorCode RDAudioStore::runStore(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_AUDIOSTORE),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
if((curl=curl_easy_init())==NULL) {
curl_formfree(first);
return RDAudioStore::ErrorInternal;

4
lib/rdcart.cpp
View File

@ -1668,9 +1668,9 @@ bool RDCart::removeCutAudio(RDStation *station,RDUser *user,unsigned cart_num,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_DELETEAUDIO),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)user->name(),CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)user->name().utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)user->password(),
CURLFORM_COPYCONTENTS,(const char *)user->password().utf8(),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,

4
lib/rdcopyaudio.cpp
View File

@ -88,9 +88,9 @@ RDCopyAudio::ErrorCode RDCopyAudio::runCopy(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_COPYAUDIO),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"SOURCE_CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_source_cart_number),

4
lib/rdpeaksexport.cpp
View File

@ -103,9 +103,9 @@ RDPeaksExport::ErrorCode RDPeaksExport::runExport(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_EXPORT_PEAKS),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_cart_number),

4
lib/rdrehash.cpp
View File

@ -81,9 +81,9 @@ RDRehash::ErrorCode RDRehash::runRehash(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_REHASH),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_cart_number),

4
lib/rdtrimaudio.cpp
View File

@ -105,9 +105,9 @@ RDTrimAudio::ErrorCode RDTrimAudio::runTrim(const QString &username,
(const char *)QString().sprintf("%u",RDXPORT_COMMAND_TRIMAUDIO),
CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"LOGIN_NAME",
CURLFORM_COPYCONTENTS,(const char *)username,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)username.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"PASSWORD",
CURLFORM_COPYCONTENTS,(const char *)password,CURLFORM_END);
CURLFORM_COPYCONTENTS,(const char *)password.utf8(),CURLFORM_END);
curl_formadd(&first,&last,CURLFORM_PTRNAME,"CART_NUMBER",
CURLFORM_COPYCONTENTS,
(const char *)QString().sprintf("%u",conv_cart_number),