kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

add some err checking to sqlite case for nonce checking

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14322 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-07-22 20:37:20 +00:00
parent 01dec7254b
commit 75d09d83bb
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -4016,11 +4016,16 @@ char *sofia_glue_execute_sql2str(sofia_profile_t *profile, switch_mutex_t *mutex
while (running < 5000) { while (running < 5000) {
int result = switch_core_db_step(stmt); int result = switch_core_db_step(stmt);
const unsigned char *txt;
if (result == SWITCH_CORE_DB_ROW) { if (result == SWITCH_CORE_DB_ROW) {
if ((colcount = switch_core_db_column_count(stmt))) { if ((colcount = switch_core_db_column_count(stmt)) > 0) {
switch_copy_string(resbuf, (char *) switch_core_db_column_text(stmt, 0), len); if ((txt = switch_core_db_column_text(stmt, 0))) {
ret = resbuf; switch_copy_string(resbuf, (char *) txt, len);
ret = resbuf;
} else {
goto fail;
}
} }
break; break;
} else if (result == SWITCH_CORE_DB_BUSY) { } else if (result == SWITCH_CORE_DB_BUSY) {

9
src/switch_core_db.c
View File

@ -57,7 +57,14 @@ SWITCH_DECLARE(int) switch_core_db_close(switch_core_db_t *db)
SWITCH_DECLARE(const unsigned char *) switch_core_db_column_text(switch_core_db_stmt_t *stmt, int iCol) SWITCH_DECLARE(const unsigned char *) switch_core_db_column_text(switch_core_db_stmt_t *stmt, int iCol)
{ {
return sqlite3_column_text(stmt, iCol); const unsigned char *txt = sqlite3_column_text(stmt, iCol);
if (txt && !strcasecmp((char *)txt, "(null)")) {
txt = NULL;
}
return txt;
} }
SWITCH_DECLARE(const char *) switch_core_db_column_name(switch_core_db_stmt_t *stmt, int N) SWITCH_DECLARE(const char *) switch_core_db_column_name(switch_core_db_stmt_t *stmt, int N)