Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-31 07:59:30 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Escaped all SQL identifiers in 'rdpadengined/'.
	* Replaced " with ' delimiters in all SQL literal strings in
	'rdpadengined/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-20 08:14:35 -04:00
parent 40337a341f
commit 1fffb2ef9e
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21519,3 +21519,7 @@
* Escaped all SQL identifiers in 'rdlogmanager/'. * Escaped all SQL identifiers in 'rdlogmanager/'.
* Replaced " with ' delimiters in all SQL literal strings in * Replaced " with ' delimiters in all SQL literal strings in
'rdlogmanager/'. 'rdlogmanager/'.
2021-04-20 Fred Gleason <fredg@paravelsystems.com>
* Escaped all SQL identifiers in 'rdpadengined/'.
* Replaced " with ' delimiters in all SQL literal strings in
'rdpadengined/'.

46
rdpadengined/rdpadengined.cpp
View File

@ -118,20 +118,20 @@ void MainObject::ripcConnectedData(bool state)
// //
// Clear DB Records // Clear DB Records
// //
sql=QString("update PYPAD_INSTANCES set ")+ sql=QString("update `PYPAD_INSTANCES` set ")+
"IS_RUNNING=\"N\","+ "`IS_RUNNING`='N',"+
"EXIT_CODE=0,"+ "`EXIT_CODE`=0,"+
"ERROR_TEXT=null "+ "`ERROR_TEXT`=null "+
"where STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; "where `STATION_NAME`='"+RDEscapeString(rda->station()->name())+"'";
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
// //
// Start Scripts // Start Scripts
// //
sql=QString("select ")+ sql=QString("select ")+
"ID " // 00 "`ID` " // 00
"from PYPAD_INSTANCES where "+ "from `PYPAD_INSTANCES` where "+
"STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"'";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
StartScript(q->value(0).toUInt()); StartScript(q->value(0).toUInt());
@ -149,9 +149,9 @@ void MainObject::notificationReceivedData(RDNotification *notify)
int id=notify->id().toUInt(); int id=notify->id().toUInt();
switch(notify->action()) { switch(notify->action()) {
case RDNotification::AddAction: case RDNotification::AddAction:
sql=QString("select ID from PYPAD_INSTANCES where ")+ sql=QString("select `ID` from `PYPAD_INSTANCES` where ")+
QString().sprintf("ID=%u && ",id)+ QString().sprintf("`ID`=%u && ",id)+
"STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; "STATION_NAME='"+RDEscapeString(rda->station()->name())+"'";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
StartScript(id); StartScript(id);
@ -233,9 +233,9 @@ void MainObject::exitData()
// //
// Update Database // Update Database
// //
QString sql=QString("update PYPAD_INSTANCES set ")+ QString sql=QString("update `PYPAD_INSTANCES` set ")+
"IS_RUNNING=\"N\" where "+ "`IS_RUNNING`='N' where "+
"STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"'";
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
exit(0); exit(0);
} }
@ -256,9 +256,9 @@ bool MainObject::ScriptIsActive(unsigned id) const
void MainObject::StartScript(unsigned id) void MainObject::StartScript(unsigned id)
{ {
QString sql=QString("select SCRIPT_PATH from PYPAD_INSTANCES where ")+ QString sql=QString("select `SCRIPT_PATH` from `PYPAD_INSTANCES` where ")+
QString().sprintf("ID=%u && ",id)+ QString().sprintf("`ID`=%u && ",id)+
"STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"'";
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
RDProcess *proc=new RDProcess(id,this); RDProcess *proc=new RDProcess(id,this);
@ -287,16 +287,16 @@ void MainObject::KillScript(unsigned id)
void MainObject::SetRunStatus(unsigned id,bool state,int exit_code, void MainObject::SetRunStatus(unsigned id,bool state,int exit_code,
const QString &err_text) const const QString &err_text) const
{ {
QString sql=QString("update PYPAD_INSTANCES set ")+ QString sql=QString("update `PYPAD_INSTANCES` set ")+
"IS_RUNNING=\""+RDYesNo(state)+"\","+ "`IS_RUNNING`='"+RDYesNo(state)+"',"+
QString().sprintf("EXIT_CODE=%u,",exit_code); QString().sprintf("`EXIT_CODE`=%u,",exit_code);
if(err_text.isNull()) { if(err_text.isNull()) {
sql+="ERROR_TEXT=null "; sql+="`ERROR_TEXT`=null ";
} }
else { else {
sql+="ERROR_TEXT=\""+RDEscapeString(err_text)+"\" "; sql+="`ERROR_TEXT`='"+RDEscapeString(err_text)+"' ";
} }
sql+=QString().sprintf("where ID=%u",id); sql+=QString().sprintf("where `ID`=%u",id);
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
} }