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

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

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

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-19 16:56:35 -04:00
parent 55bd817e3f
commit 3548d6c60e
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21467,3 +21467,7 @@
2021-04-19 Fred Gleason <fredg@paravelsystems.com>
* Updated 'CODINGSTYLE' to include requirements for escaping
identifiers and quoting string literals.
2021-04-18 Fred Gleason <fredg@paravelsystems.com>
* Escaped all SQL identifiers in 'cae/'.
* Replaced " with ' delimiters in all SQL literal strings in
'cae/'.

8
cae/cae.cpp
View File

@ -1615,8 +1615,8 @@ void MainObject::InitProvisioning() const
//
if(rd_config->provisioningCreateHost()) {
if(!rd_config->provisioningHostTemplate().isEmpty()) {
sql=QString("select NAME from STATIONS where ")+
"NAME=\""+RDEscapeString(rd_config->stationName())+"\"";
sql=QString("select `NAME` from `STATIONS` where ")+
"`NAME`='"+RDEscapeString(rd_config->stationName())+"'";
q=new RDSqlQuery(sql);
if(!q->first()) {
if(RDStation::create(rd_config->stationName(),&err_msg,rd_config->provisioningHostTemplate(),rd_config->provisioningHostIpAddress())) {
@ -1648,8 +1648,8 @@ void MainObject::InitProvisioning() const
if(!rd_config->provisioningServiceTemplate().isEmpty()) {
QString svcname=
rd_config->provisioningServiceName(rd_config->stationName());
sql=QString("select NAME from SERVICES where ")+
"NAME=\""+RDEscapeString(svcname)+"\"";
sql=QString("select `NAME` from `SERVICES` where ")+
"`NAME`='"+RDEscapeString(svcname)+"'";
q=new RDSqlQuery(sql);
if(!q->first()) {
if(RDSvc::create(svcname,&err_msg,

8
cae/cae_jack.cpp
View File

@ -432,10 +432,10 @@ void MainObject::jackClientStartData()
{
#ifdef JACK
QString sql=QString("select ")+
"DESCRIPTION,"+ // 00
"COMMAND_LINE "+ // 01
"from JACK_CLIENTS where "+
"STATION_NAME=\""+RDEscapeString(rd_config->stationName())+"\"";
"`DESCRIPTION`,"+ // 00
"`COMMAND_LINE` "+ // 01
"from `JACK_CLIENTS` where "+
"`STATION_NAME`='"+RDEscapeString(rd_config->stationName())+"'";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
QString cmd=RDDateDecode(q->value(1).toString(),QDate::currentDate(),