From a7c92fad28bb88bec2bf5b9f093971ca3b574545 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 17 Jul 2010 17:39:28 +0000
Subject: [PATCH] Merged revisions 277568 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r277568 | tilghman | 2010-07-16 16:54:29 -0500 (Fri, 16 Jul 2010) | 8 lines
Since we split values at the semicolon, we should store values with a semicolon as an encoded value.
(closes issue #17369)
Reported by: gkservice
Patches:
20100625__issue17369.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
addons/res_config_mysql.c | 60 +++++++++++++--------
include/asterisk/config.h | 21 ++++++++
main/config.c | 31 ++++++++++-
res/res_config_odbc.c | 110 +++++++++++++++++++++++++++++++-------
res/res_config_pgsql.c | 29 ++++++----
5 files changed, 202 insertions(+), 49 deletions(-)
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index fc0d94e375..fc449d26be 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -46,6 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cli.h"
#include "asterisk/utils.h"
#include "asterisk/threadstorage.h"
+#include "asterisk/strings.h"
#define RES_CONFIG_MYSQL_CONF "res_config_mysql.conf"
#define RES_CONFIG_MYSQL_CONF_OLD "res_mysql.conf"
@@ -54,16 +55,27 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define ESCAPE_STRING(buf, var) \
do { \
- if ((valsz = strlen(var)) * 2 + 1 > ast_str_size(buf)) { \
- ast_str_make_space(&(buf), valsz * 2 + 1); \
+ struct ast_str *semi = ast_str_thread_get(&scratch2_buf, strlen(var) * 3 + 1); \
+ const char *chunk = var; \
+ ast_str_reset(semi); \
+ for (; *chunk; chunk++) { \
+ if (strchr(";^", *chunk)) { \
+ ast_str_append(&semi, 0, "^%02hhX", *chunk); \
+ } else { \
+ ast_str_append(&semi, 0, "%c", *chunk); \
+ } \
} \
- mysql_real_escape_string(&dbh->handle, ast_str_buffer(buf), var, valsz); \
+ if (ast_str_strlen(semi) * 2 + 1 > ast_str_size(buf)) { \
+ ast_str_make_space(&(buf), ast_str_strlen(semi) * 2 + 1); \
+ } \
+ mysql_real_escape_string(&dbh->handle, ast_str_buffer(buf), ast_str_buffer(semi), ast_str_strlen(semi)); \
} while (0)
AST_THREADSTORAGE(sql_buf);
AST_THREADSTORAGE(sql2_buf);
AST_THREADSTORAGE(find_buf);
AST_THREADSTORAGE(scratch_buf);
+AST_THREADSTORAGE(scratch2_buf);
AST_THREADSTORAGE(modify_buf);
AST_THREADSTORAGE(modify2_buf);
AST_THREADSTORAGE(modify3_buf);
@@ -290,13 +302,25 @@ static struct columns *find_column(struct tables *table, const char *colname)
return column;
}
+static char *decode_chunk(char *chunk)
+{
+ char *orig = chunk;
+ for (; *chunk; chunk++) {
+ if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
+ sscanf(chunk + 1, "%02hhd", chunk);
+ memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
+ }
+ }
+ return orig;
+}
+
static struct ast_variable *realtime_mysql(const char *database, const char *table, va_list ap)
{
struct mysql_conn *dbh;
MYSQL_RES *result;
MYSQL_ROW row;
MYSQL_FIELD *fields;
- int numFields, i, valsz;
+ int numFields, i;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 16);
struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16);
char *stringp;
@@ -375,11 +399,11 @@ static struct ast_variable *realtime_mysql(const char *database, const char *tab
}
for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
if (prev) {
- if ((prev->next = ast_variable_new(fields[i].name, chunk, ""))) {
+ if ((prev->next = ast_variable_new(fields[i].name, decode_chunk(chunk), ""))) {
prev = prev->next;
}
} else {
- prev = var = ast_variable_new(fields[i].name, chunk, "");
+ prev = var = ast_variable_new(fields[i].name, decode_chunk(chunk), "");
}
}
}
@@ -400,7 +424,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
MYSQL_RES *result;
MYSQL_ROW row;
MYSQL_FIELD *fields;
- int numFields, i, valsz;
+ int numFields, i;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 16);
struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16);
const char *initfield = NULL;
@@ -500,7 +524,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
if (ast_strlen_zero(row[i]))
continue;
for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
- if (chunk && !ast_strlen_zero(ast_strip(chunk))) {
+ if (chunk && !ast_strlen_zero(decode_chunk(ast_strip(chunk)))) {
if (initfield && !strcmp(initfield, fields[i].name)) {
ast_category_rename(cat, chunk);
}
@@ -525,7 +549,6 @@ static int update_mysql(const char *database, const char *tablename, const char
{
struct mysql_conn *dbh;
my_ulonglong numrows;
- int valsz;
const char *newparam, *newval;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 100), *buf = ast_str_thread_get(&scratch_buf, 100);
struct tables *table;
@@ -535,7 +558,7 @@ static int update_mysql(const char *database, const char *tablename, const char
ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
return -1;
}
-
+
if (!tablename) {
ast_log(LOG_WARNING, "MySQL RealTime: No table specified.\n");
release_database(dbh);
@@ -588,7 +611,7 @@ static int update_mysql(const char *database, const char *tablename, const char
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
- internal_require(database, tablename, newparam, RQ_CHAR, valsz, SENTINEL);
+ internal_require(database, tablename, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
}
while ((newparam = va_arg(ap, const char *))) {
@@ -605,7 +628,7 @@ static int update_mysql(const char *database, const char *tablename, const char
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
- internal_require(database, tablename, newparam, RQ_CHAR, valsz, SENTINEL);
+ internal_require(database, tablename, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
}
}
va_end(ap);
@@ -644,7 +667,6 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
my_ulonglong numrows;
int first = 1;
const char *newparam, *newval;
- size_t valsz;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 100), *buf = ast_str_thread_get(&scratch_buf, 100);
struct ast_str *where = ast_str_thread_get(&sql2_buf, 100);
struct tables *table;
@@ -701,7 +723,7 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
- internal_require(database, tablename, newparam, RQ_CHAR, valsz, SENTINEL);
+ internal_require(database, tablename, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
}
}
@@ -725,7 +747,7 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
- internal_require(database, tablename, newparam, RQ_CHAR, valsz, SENTINEL);
+ internal_require(database, tablename, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
}
}
va_end(ap);
@@ -764,7 +786,6 @@ static int store_mysql(const char *database, const char *table, va_list ap)
struct ast_str *sql = ast_str_thread_get(&sql_buf, 16);
struct ast_str *sql2 = ast_str_thread_get(&sql2_buf, 16);
struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16);
- int valsz;
const char *newparam, *newval;
if (!(dbh = find_database(database, 1))) {
@@ -796,16 +817,15 @@ static int store_mysql(const char *database, const char *table, va_list ap)
ast_str_set(&sql, 0, "INSERT INTO %s (%s", table, newparam);
ast_str_set(&sql2, 0, ") VALUES ('%s'", ast_str_buffer(buf));
- internal_require(database, table, newparam, RQ_CHAR, valsz, SENTINEL);
+ internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
while ((newparam = va_arg(ap, const char *))) {
if ((newval = va_arg(ap, const char *))) {
ESCAPE_STRING(buf, newval);
} else {
- valsz = 0;
ast_str_reset(buf);
}
- if (internal_require(database, table, newparam, RQ_CHAR, valsz, SENTINEL) == 0) {
+ if (internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL) == 0) {
ast_str_append(&sql, 0, ", %s", newparam);
ast_str_append(&sql2, 0, ", '%s'", ast_str_buffer(buf));
}
@@ -841,7 +861,6 @@ static int destroy_mysql(const char *database, const char *table, const char *ke
my_ulonglong numrows;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 16);
struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16);
- int valsz;
const char *newparam, *newval;
if (!(dbh = find_database(database, 1))) {
@@ -1059,7 +1078,6 @@ static int modify_mysql(const char *database, const char *tablename, struct colu
ast_str_append(&sql, 0, " NOT NULL");
}
if (!ast_strlen_zero(column->dflt)) {
- size_t valsz;
ESCAPE_STRING(escbuf, column->dflt);
ast_str_append(&sql, 0, " DEFAULT '%s'", ast_str_buffer(escbuf));
}
diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index fdaeb0e3e7..c5f79730d3 100644
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -729,6 +729,27 @@ int ast_rq_is_int(require_type type),
}
)
+/*!
+ * \brief Remove standard encoding from realtime values, which ensures
+ * that a semicolon embedded within a single value is not treated upon
+ * retrieval as multiple values.
+ * \param chunk Data to be decoded
+ * \return The decoded data, in the original buffer
+ * \since 1.8
+ * \warn This function modifies the original buffer
+ */
+char *ast_realtime_decode_chunk(char *chunk);
+
+/*!
+ * \brief Encodes a chunk of data for realtime
+ * \param dest Destination buffer
+ * \param maxlen Length passed through to ast_str_* functions
+ * \param chunk Source data to be encoded
+ * \return Buffer within dest
+ * \since 1.8
+ */
+char *ast_realtime_encode_chunk(struct ast_str **dest, ssize_t maxlen, const char *chunk);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/main/config.c b/main/config.c
index e1c51dcd64..f65c69e537 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2010, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -2297,6 +2297,35 @@ int ast_destroy_realtime(const char *family, const char *keyfield, const char *l
return res;
}
+char *ast_realtime_decode_chunk(char *chunk)
+{
+ char *orig = chunk;
+ for (; *chunk; chunk++) {
+ if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
+ sscanf(chunk + 1, "%02hhd", chunk);
+ memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
+ }
+ }
+ return orig;
+}
+
+char *ast_realtime_encode_chunk(struct ast_str **dest, ssize_t maxlen, const char *chunk)
+{
+ if (!strchr(chunk, ';') && !strchr(chunk, '^')) {
+ ast_str_set(dest, maxlen, "%s", chunk);
+ } else {
+ ast_str_reset(*dest);
+ for (; *chunk; chunk++) {
+ if (strchr(";^", *chunk)) {
+ ast_str_append(dest, maxlen, "^%02hhX", *chunk);
+ } else {
+ ast_str_append(dest, maxlen, "%c", *chunk);
+ }
+ }
+ }
+ return ast_str_buffer(*dest);
+}
+
/*! \brief Helper function to parse arguments
* See documentation in config.h
*/
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 0b1d5a14a6..f06ab25c2d 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2010, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -44,21 +44,36 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/res_odbc.h"
#include "asterisk/utils.h"
+#include "asterisk/stringfields.h"
AST_THREADSTORAGE(sql_buf);
struct custom_prepare_struct {
const char *sql;
const char *extra;
+ AST_DECLARE_STRING_FIELDS(
+ AST_STRING_FIELD(encoding)[256];
+ );
va_list ap;
unsigned long long skip;
};
+static void decode_chunk(char *chunk)
+{
+ for (; *chunk; chunk++) {
+ if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
+ sscanf(chunk + 1, "%02hhd", chunk);
+ memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
+ }
+ }
+}
+
static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data)
{
int res, x = 1, count = 0;
struct custom_prepare_struct *cps = data;
const char *newparam, *newval;
+ char encodebuf[1024];
SQLHSTMT stmt;
va_list ap;
@@ -86,6 +101,27 @@ static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data)
continue;
}
ast_debug(1, "Parameter %d ('%s') = '%s'\n", x, newparam, newval);
+ if (strchr(newval, ';') || strchr(newval, '^')) {
+ char *eptr = encodebuf;
+ const char *vptr = newval;
+ for (; *vptr && eptr < encodebuf + sizeof(encodebuf); vptr++) {
+ if (strchr("^;", *vptr)) {
+ /* We use ^XX, instead of %XX because '%' is a special character in SQL */
+ snprintf(eptr, encodebuf + sizeof(encodebuf) - eptr, "^%02hhX", *vptr);
+ eptr += 3;
+ vptr++;
+ } else {
+ *eptr++ = *vptr++;
+ }
+ }
+ if (eptr < encodebuf + sizeof(encodebuf)) {
+ *eptr = '\0';
+ } else {
+ encodebuf[sizeof(encodebuf) - 1] = '\0';
+ }
+ ast_string_field_set(cps, encoding[x], encodebuf);
+ newval = cps->encoding[x];
+ }
SQLBindParameter(stmt, x++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(newval), 0, (void *)newval, 0, NULL);
}
va_end(ap);
@@ -132,22 +168,29 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
va_list aq;
struct custom_prepare_struct cps = { .sql = sql };
+ if (ast_string_field_init(&cps, 256)) {
+ return NULL;
+ }
va_copy(cps.ap, ap);
va_copy(aq, ap);
- if (!table)
+ if (!table) {
+ ast_string_field_free_memory(&cps);
return NULL;
+ }
obj = ast_odbc_request_obj(database, 0);
if (!obj) {
ast_log(LOG_ERROR, "No database handle available with the name of '%s' (check res_odbc.conf)\n", database);
+ ast_string_field_free_memory(&cps);
return NULL;
}
newparam = va_arg(aq, const char *);
if (!newparam) {
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
newval = va_arg(aq, const char *);
@@ -166,6 +209,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
if (!stmt) {
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
@@ -174,6 +218,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
ast_log(LOG_WARNING, "SQL Column Count error!\n[%s]\n\n", sql);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
@@ -181,12 +226,14 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
if (res == SQL_NO_DATA) {
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Fetch error!\n[%s]\n\n", sql);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
for (x = 0; x < colcount; x++) {
@@ -199,6 +246,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
if (var)
ast_variables_destroy(var);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
@@ -220,15 +268,20 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
return NULL;
}
stringp = rowdata;
- while(stringp) {
+ while (stringp) {
chunk = strsep(&stringp, ";");
if (!ast_strlen_zero(ast_strip(chunk))) {
+ if (strchr(chunk, '^')) {
+ decode_chunk(chunk);
+ }
if (prev) {
prev->next = ast_variable_new(coltitle, chunk, "");
- if (prev->next)
+ if (prev->next) {
prev = prev->next;
- } else
+ }
+ } else {
prev = var = ast_variable_new(coltitle, chunk, "");
+ }
}
}
}
@@ -236,6 +289,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return var;
}
@@ -280,19 +334,23 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
struct custom_prepare_struct cps = { .sql = sql };
va_list aq;
+ if (!table || ast_string_field_init(&cps, 256)) {
+ return NULL;
+ }
va_copy(cps.ap, ap);
va_copy(aq, ap);
- if (!table)
- return NULL;
obj = ast_odbc_request_obj(database, 0);
- if (!obj)
+ if (!obj) {
+ ast_string_field_free_memory(&cps);
return NULL;
+ }
newparam = va_arg(aq, const char *);
if (!newparam) {
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
initfield = ast_strdupa(newparam);
@@ -316,6 +374,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
if (!stmt) {
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
@@ -324,6 +383,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
ast_log(LOG_WARNING, "SQL Column Count error!\n[%s]\n\n", sql);
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
@@ -332,6 +392,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
ast_log(LOG_WARNING, "Out of memory!\n");
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return NULL;
}
@@ -368,11 +429,15 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
continue;
}
stringp = rowdata;
- while(stringp) {
+ while (stringp) {
chunk = strsep(&stringp, ";");
if (!ast_strlen_zero(ast_strip(chunk))) {
- if (initfield && !strcmp(initfield, coltitle))
+ if (strchr(chunk, '^')) {
+ decode_chunk(chunk);
+ }
+ if (initfield && !strcmp(initfield, coltitle)) {
ast_category_rename(cat, chunk);
+ }
var = ast_variable_new(coltitle, chunk, "");
ast_variable_append(cat, var);
}
@@ -383,6 +448,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return cfg;
}
@@ -411,20 +477,24 @@ static int update_odbc(const char *database, const char *table, const char *keyf
int res, count = 1;
va_list aq;
struct custom_prepare_struct cps = { .sql = sql, .extra = lookup };
- struct odbc_cache_tables *tableptr = ast_odbc_find_table(database, table);
+ struct odbc_cache_tables *tableptr;
struct odbc_cache_columns *column;
+ if (!table) {
+ return -1;
+ }
+
va_copy(cps.ap, ap);
va_copy(aq, ap);
-
- if (!table) {
- ast_odbc_release_table(tableptr);
+
+ if (ast_string_field_init(&cps, 256)) {
return -1;
}
- obj = ast_odbc_request_obj(database, 0);
- if (!obj) {
+ tableptr = ast_odbc_find_table(database, table);
+ if (!(obj = ast_odbc_request_obj(database, 0))) {
ast_odbc_release_table(tableptr);
+ ast_string_field_free_memory(&cps);
return -1;
}
@@ -432,6 +502,7 @@ static int update_odbc(const char *database, const char *table, const char *keyf
if (!newparam) {
ast_odbc_release_obj(obj);
ast_odbc_release_table(tableptr);
+ ast_string_field_free_memory(&cps);
return -1;
}
newval = va_arg(aq, const char *);
@@ -458,20 +529,23 @@ static int update_odbc(const char *database, const char *table, const char *keyf
if (!stmt) {
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
return -1;
}
res = SQLRowCount(stmt, &rowcount);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
+ ast_string_field_free_memory(&cps);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Row Count error!\n[%s]\n\n", sql);
return -1;
}
- if (rowcount >= 0)
- return (int)rowcount;
+ if (rowcount >= 0) {
+ return (int) rowcount;
+ }
return -1;
}
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index b4ff74d546..3bed287e67 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1,8 +1,8 @@
/*
* Asterisk -- A telephony toolkit for Linux.
*
- * Copyright (C) 1999-2005, Digium, Inc.
- *
+ * Copyright (C) 1999-2010, Digium, Inc.
+ *
* Manuel Guesdon <mguesdon@oxymium.net> - PostgreSQL RealTime Driver Author/Adaptor
* Mark Spencer <markster@digium.com> - Asterisk Author
* Matthew Boehm <mboehm@cytelcom.com> - MySQL RealTime Driver Author
@@ -46,6 +46,7 @@ AST_THREADSTORAGE(sql_buf);
AST_THREADSTORAGE(findtable_buf);
AST_THREADSTORAGE(where_buf);
AST_THREADSTORAGE(escapebuf_buf);
+AST_THREADSTORAGE(semibuf_buf);
#define RES_CONFIG_PGSQL_CONF "res_pgsql.conf"
@@ -95,11 +96,21 @@ static struct ast_cli_entry cli_realtime[] = {
#define ESCAPE_STRING(buffer, stringname) \
do { \
- int len; \
- if ((len = strlen(stringname)) > (ast_str_size(buffer) - 1) / 2) { \
- ast_str_make_space(&buffer, len * 2 + 1); \
+ int len = strlen(stringname); \
+ struct ast_str *semi = ast_str_thread_get(&semibuf_buf, len * 3 + 1); \
+ const char *chunk = stringname; \
+ ast_str_reset(semi); \
+ for (; *chunk; chunk++) { \
+ if (strchr(";^", *chunk)) { \
+ ast_str_append(&semi, 0, "^%02hhX", *chunk); \
+ } else { \
+ ast_str_append(&semi, 0, "%c", *chunk); \
+ } \
+ } \
+ if (ast_str_strlen(semi) > (ast_str_size(buffer) - 1) / 2) { \
+ ast_str_make_space(&buffer, ast_str_strlen(semi) * 2 + 1); \
} \
- PQescapeStringConn(pgsqlConn, ast_str_buffer(buffer), stringname, len, &pgresult); \
+ PQescapeStringConn(pgsqlConn, ast_str_buffer(buffer), ast_str_buffer(semi), ast_str_size(buffer), &pgresult); \
} while (0)
static void destroy_table(struct tables *table)
@@ -391,7 +402,7 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
stringp = PQgetvalue(result, rowIndex, i);
while (stringp) {
chunk = strsep(&stringp, ";");
- if (!ast_strlen_zero(ast_strip(chunk))) {
+ if (chunk && !ast_strlen_zero(ast_realtime_decode_chunk(ast_strip(chunk)))) {
if (prev) {
prev->next = ast_variable_new(fieldnames[i], chunk, "");
if (prev->next) {
@@ -550,7 +561,7 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char
stringp = PQgetvalue(result, rowIndex, i);
while (stringp) {
chunk = strsep(&stringp, ";");
- if (!ast_strlen_zero(ast_strip(chunk))) {
+ if (chunk && !ast_strlen_zero(ast_realtime_decode_chunk(ast_strip(chunk)))) {
if (initfield && !strcmp(initfield, fieldnames[i])) {
ast_category_rename(cat, chunk);
}
@@ -744,7 +755,7 @@ static int update2_pgsql(const char *database, const char *tablename, va_list ap
release_table(table);
return -1;
}
-
+
newval = va_arg(ap, const char *);
ESCAPE_STRING(escapebuf, newval);
if (pgresult) {
--
GitLab