kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-11 15:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdr_pgsql: Use PQescapeStringConn for escaping names.

Browse Source 
Use function PQescapeStringConn for escaping the name
of the table and schema instead of doing it manually.

Change-Id: I6709165e2d00463e9c813d24f17830ad4910b599
This commit is contained in:
Rodrigo Ramírez Norambuena
2015-05-02 00:43:22 -04:00
committed by Joshua Colp
parent 32eb812b28
commit c61b146238
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cdr/cdr_pgsql.c
View File

@@ -670,42 +670,20 @@ static int config_module(int reload)
version = PQserverVersion(conn); version = PQserverVersion(conn);
if (version >= 70300) { if (version >= 70300) {
char *schemaname, *tablename; char *schemaname, *tablename, *tmp_schemaname, *tmp_tablename;
if (strchr(table, '.')) { if (strchr(table, '.')) {
schemaname = ast_strdupa(table); tmp_schemaname = ast_strdupa(table);
tablename = strchr(schemaname, '.'); tmp_tablename = strchr(tmp_schemaname, '.');
*tablename++ = '\0'; *tmp_tablename++ = '\0';
} else { } else {
schemaname = ""; tmp_schemaname = "";
tablename = table; tmp_tablename = table;
} }
tablename = ast_alloca(strlen(tmp_tablename) * 2 + 1);
PQescapeStringConn(conn, tablename, tmp_tablename, strlen(tmp_tablename), NULL);
/* Escape special characters in schemaname */ schemaname = ast_alloca(strlen(tmp_schemaname) * 2 + 1);
if (strchr(schemaname, '\\') || strchr(schemaname, '\'')) { PQescapeStringConn(conn, schemaname, tmp_schemaname, strlen(tmp_schemaname), NULL);
char *tmp = schemaname, *ptr;
ptr = schemaname = ast_alloca(strlen(tmp) * 2 + 1);
for (; *tmp; tmp++) {
if (strchr("\\'", *tmp)) {
*ptr++ = *tmp;
}
*ptr++ = *tmp;
}
*ptr = '\0';
}
/* Escape special characters in tablename */
if (strchr(tablename, '\\') || strchr(tablename, '\'')) {
char *tmp = tablename, *ptr;
ptr = tablename = ast_alloca(strlen(tmp) * 2 + 1);
for (; *tmp; tmp++) {
if (strchr("\\'", *tmp)) {
*ptr++ = *tmp;
}
*ptr++ = *tmp;
}
*ptr = '\0';
}
snprintf(sqlcmd, sizeof(sqlcmd), "SELECT a.attname, t.typname, a.attlen, a.attnotnull, d.adsrc, a.atttypmod FROM (((pg_catalog.pg_class c INNER JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace AND c.relname = '%s' AND n.nspname = %s%s%s) INNER JOIN pg_catalog.pg_attribute a ON (NOT a.attisdropped) AND a.attnum > 0 AND a.attrelid = c.oid) INNER JOIN pg_catalog.pg_type t ON t.oid = a.atttypid) LEFT OUTER JOIN pg_attrdef d ON a.atthasdef AND d.adrelid = a.attrelid AND d.adnum = a.attnum ORDER BY n.nspname, c.relname, attnum", snprintf(sqlcmd, sizeof(sqlcmd), "SELECT a.attname, t.typname, a.attlen, a.attnotnull, d.adsrc, a.atttypmod FROM (((pg_catalog.pg_class c INNER JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace AND c.relname = '%s' AND n.nspname = %s%s%s) INNER JOIN pg_catalog.pg_attribute a ON (NOT a.attisdropped) AND a.attnum > 0 AND a.attrelid = c.oid) INNER JOIN pg_catalog.pg_type t ON t.oid = a.atttypid) LEFT OUTER JOIN pg_attrdef d ON a.atthasdef AND d.adrelid = a.attrelid AND d.adnum = a.attnum ORDER BY n.nspname, c.relname, attnum",
tablename, tablename,