Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix crash when there's a "'" in model name

Browse source
This commit is contained in:
Eric House 2014-04-25 07:41:58 -07:00
parent 6e011ab36f
commit 6eaf7a57b5
2 changed files with 98 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
xwords4/relay/dbmgr.cpp
View file

@ -365,6 +365,18 @@ DBMgr::AllDevsAckd( const char* const connName )
return full;
}
static void
getPtrs( vector<const char*>& paramValues, const char* base, vector<size_t>& offsets )
{
size_t ii;
for ( ii = 0; ii < offsets.size(); ++ii ) {
const char* ptr = offsets[ii] + base;
paramValues.push_back( ptr );
logf( XW_LOGINFO, "%s: str[%d] points at: %s", __func__, ii,
paramValues[ii] );
}
}
// Return DevIDRelay for device, adding it to devices table IFF it's not
// already there.
DevIDRelay
@ -397,13 +409,31 @@ DBMgr::RegisterDevice( const DevID* host, int clientVersion,
} while ( DEVID_NONE == devID );
StrWPF query;
StrWPF paramBuf;
vector<size_t> paramIndices;
query.catf( "INSERT INTO " DEVICES_TABLE " (id, devTypes[1],"
" devids[1], clntVers, versdesc, model, osvers)"
" VALUES( %d, %d, '%s', %d, '%s', '%s', '%s' )",
devID, host->m_devIDType, devidStr, clientVersion,
desc, model, osVers );
logf( XW_LOGINFO, "%s: %s", __func__, query.c_str() );
success = execSql( query );
" VALUES( $1, $2, $3, $4, $5, $6, $7 )" );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%d%c", devID, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%d%c", host->m_devIDType, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", devidStr, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%d%c", clientVersion, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", desc, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", model, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", osVers, '\0' );
vector<const char*> paramValues;
getPtrs( paramValues, paramBuf.c_str(), paramIndices );
success = execParams( query, paramValues );
}
}
return devID;
@ -420,15 +450,24 @@ DBMgr::ReregisterDevice( DevIDRelay relayID, const DevID* host,
const char* const desc, int clientVersion,
const char* const model, const char* const osVers )
{
// First update the existing
StrWPF query;
query.catf( "UPDATE " DEVICES_TABLE " SET "
"devTypes = array_prepend( %d, devTypes), "
"devids = array_prepend('%s', devids), ",
host->m_devIDType, host->m_devIDString.c_str() );
StrWPF paramBuf;
vector<size_t> paramIndices;
formatUpdate( query, true, desc, clientVersion, model, osVers, relayID );
execSql( query );
query.catf( "UPDATE " DEVICES_TABLE " SET "
"devTypes = array_prepend( $1, devTypes), "
"devids = array_prepend($2, devids), " );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%d%c", host->m_devIDType, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", host->m_devIDString.c_str(), '\0' );
formatUpdate( query, paramBuf, paramIndices, true, desc, clientVersion,
model, osVers, relayID );
vector<const char*> paramValues;
getPtrs( paramValues, paramBuf.c_str(), paramIndices );
execParams( query, paramValues );
}
// Return true if the relayID exists in the DB already
@ -447,8 +486,15 @@ DBMgr::UpdateDevice( DevIDRelay relayID, const char* const desc,
if ( exists ) {
StrWPF query;
query.catf( "UPDATE " DEVICES_TABLE " SET " );
formatUpdate( query, false, desc, clientVersion, model, osVers, relayID );
execSql( query );
StrWPF paramBuf;
vector<size_t> paramIndices;
formatUpdate( query, paramBuf, paramIndices, false, desc,
clientVersion, model, osVers, relayID );
vector<const char*> paramValues;
getPtrs( paramValues, paramBuf.c_str(), paramIndices );
execParams( query, paramValues );
}
return exists;
}
@ -460,7 +506,8 @@ DBMgr::UpdateDevice( DevIDRelay relayID )
}
void
DBMgr::formatUpdate( StrWPF& query, bool append, const char* const desc,
DBMgr::formatUpdate( StrWPF& query, StrWPF& paramBuf, vector<size_t>& paramIndices,
bool append, const char* const desc,
int clientVersion, const char* const model,
const char* const osVers, DevIDRelay relayID )
{
@ -470,16 +517,29 @@ DBMgr::formatUpdate( StrWPF& query, bool append, const char* const desc,
query.catf( "mtimes[1]='now'" );
}
int count = paramIndices.size();
if ( NULL != desc && '\0' != desc[0] ) {
query.catf( ", clntVers=%d, versDesc='%s'", clientVersion, desc );
query.catf( ", clntVers=$%d, versDesc=$%d", 1 + count, 2 + count );
count += 2;
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%d%c", clientVersion, '\0' );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", desc, '\0' );
}
if ( NULL != model && '\0' != model[0] ) {
query.catf( ", model='%s'", model );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", model, '\0' );
query.catf( ", model=$%d", ++count );
}
if ( NULL != osVers && '\0' != osVers[0] ) {
query.catf( ", osvers='%s'", osVers );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%s%c", osVers, '\0' );
query.catf( ", osvers=$%d", ++count );
}
query.catf( " WHERE id = %d", relayID );
paramIndices.push_back( paramBuf.size() );
paramBuf.catf( "%d%c", relayID, '\0' );
query.catf( " WHERE id = $%d", ++count );
}
HostID
@ -831,6 +891,22 @@ DBMgr::execSql( const char* const query )
return ok;
}
bool
DBMgr::execParams( const string& query, vector<const char*> paramValues )
{
PGresult* result = PQexecParams( getThreadConn(), query.c_str(),
paramValues.size(), NULL,
&paramValues[0],
NULL, NULL, 0 );
bool success = PGRES_COMMAND_OK == PQresultStatus( result );
if ( !success ) {
logf( XW_LOGERROR, "PQexecParams(%s)=>%s;%s", query.c_str(),
PQresStatus(PQresultStatus(result)),
PQresultErrorMessage(result) );
}
return success;
}
void
DBMgr::readArray( const char* const connName, const char* column, int arr[] ) /* len 4 */
{

4
xwords4/relay/dbmgr.h
View file

@ -149,6 +149,7 @@ class DBMgr {
DBMgr();
bool execSql( const string& query );
bool execSql( const char* const query ); /* no-results query */
bool execParams( const string& query, vector<const char*> params );
void readArray( const char* const connName, const char* column, int arr[] );
DevIDRelay getDevID( const char* connName, int hid );
DevIDRelay getDevID( const DevID* devID );
@ -160,7 +161,8 @@ class DBMgr {
bool nullConnnameOK );
int CountStoredMessages( const char* const connName, int hid );
bool UpdateDevice( DevIDRelay relayID );
void formatUpdate( StrWPF& query, bool append, const char* const desc,
void formatUpdate( StrWPF& query, StrWPF& prmBuf, vector<size_t>& prmIndices,
bool append, const char* const desc,
int clientVersion, const char* const model,
const char* const osVers, DevIDRelay relayID );