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

addons/res_config_mysql: Don't mutate va_list parameters

Browse Source 
The realtime API passes down the va_list argument to each RT engine in
failover chain until one succeeds. MySQL engine used to access the
variable argument list with va_arg, which mutates the va_list, so the
next engine in failover chain gets invalid agrument list.
This patch uses va_copy to preserve the original va_list argument intact.

ASTERISK-19538 #close
Reported by: alexat
Tested by: Ivan Poddubny

Change-Id: I7738b9f98bde81ddfbc2c0fa579d85a0c3e580ae
This commit is contained in:
Ivan Poddubny
2015-04-29 06:24:58 +00:00
parent 9bee1cae12
commit 41bf52315a
1 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
addons/res_config_mysql.c
View File

@@ -330,6 +330,7 @@ static struct ast_variable *realtime_mysql(const char *database, const char *tab
char *op; char *op;
const char *newparam, *newval; const char *newparam, *newval;
struct ast_variable *var=NULL, *prev=NULL; struct ast_variable *var=NULL, *prev=NULL;
va_list aq;
if (!(dbh = find_database(database, 0))) { if (!(dbh = find_database(database, 0))) {
ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: %s (check res_mysql.conf)\n", database); ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: %s (check res_mysql.conf)\n", database);
@@ -343,14 +344,17 @@ static struct ast_variable *realtime_mysql(const char *database, const char *tab
} }
/* Get the first parameter and first value in our list of passed paramater/value pairs */ /* Get the first parameter and first value in our list of passed paramater/value pairs */
if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) { va_copy(aq, ap);
if (!(newparam = va_arg(aq, const char *)) || !(newval = va_arg(aq, const char *))) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");
va_end(aq);
release_database(dbh); release_database(dbh);
return NULL; return NULL;
} }
/* Must connect to the server before anything else, as the escape function requires the mysql handle. */ /* Must connect to the server before anything else, as the escape function requires the mysql handle. */
if (!mysql_reconnect(dbh)) { if (!mysql_reconnect(dbh)) {
va_end(aq);
release_database(dbh); release_database(dbh);
return NULL; return NULL;
} }
@@ -365,8 +369,8 @@ static struct ast_variable *realtime_mysql(const char *database, const char *tab
ESCAPE_STRING(buf, newval); ESCAPE_STRING(buf, newval);
ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, ast_str_buffer(buf)); ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, ast_str_buffer(buf));
while ((newparam = va_arg(ap, const char *))) { while ((newparam = va_arg(aq, const char *))) {
newval = va_arg(ap, const char *); newval = va_arg(aq, const char *);
if (!strchr(newparam, ' ')) if (!strchr(newparam, ' '))
op = " ="; op = " =";
else else
@@ -380,6 +384,7 @@ static struct ast_variable *realtime_mysql(const char *database, const char *tab
/* Execution. */ /* Execution. */
if (mysql_real_query(&dbh->handle, ast_str_buffer(sql), ast_str_strlen(sql))) { if (mysql_real_query(&dbh->handle, ast_str_buffer(sql), ast_str_strlen(sql))) {
ast_log(LOG_WARNING, "MySQL RealTime: Failed to query database: %s\n", mysql_error(&dbh->handle)); ast_log(LOG_WARNING, "MySQL RealTime: Failed to query database: %s\n", mysql_error(&dbh->handle));
va_end(aq);
release_database(dbh); release_database(dbh);
return NULL; return NULL;
} }
@@ -411,6 +416,7 @@ static struct ast_variable *realtime_mysql(const char *database, const char *tab
ast_debug(1, "MySQL RealTime: Could not find any rows in table %s.\n", table); ast_debug(1, "MySQL RealTime: Could not find any rows in table %s.\n", table);
} }
va_end(aq);
release_database(dbh); release_database(dbh);
mysql_free_result(result); mysql_free_result(result);
@@ -434,6 +440,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
struct ast_variable *var = NULL; struct ast_variable *var = NULL;
struct ast_config *cfg = NULL; struct ast_config *cfg = NULL;
struct ast_category *cat = NULL; struct ast_category *cat = NULL;
va_list aq;
if (!(dbh = find_database(database, 0))) { if (!(dbh = find_database(database, 0))) {
ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database); ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
@@ -454,8 +461,10 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
} }
/* Get the first parameter and first value in our list of passed paramater/value pairs */ /* Get the first parameter and first value in our list of passed paramater/value pairs */
if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) { va_copy(aq, ap);
if (!(newparam = va_arg(aq, const char *)) || !(newval = va_arg(aq, const char *))) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");
va_end(aq);
ast_config_destroy(cfg); ast_config_destroy(cfg);
release_database(dbh); release_database(dbh);
return NULL; return NULL;
@@ -468,6 +477,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
/* Must connect to the server before anything else, as the escape function requires the mysql handle. */ /* Must connect to the server before anything else, as the escape function requires the mysql handle. */
if (!mysql_reconnect(dbh)) { if (!mysql_reconnect(dbh)) {
va_end(aq);
release_database(dbh); release_database(dbh);
ast_config_destroy(cfg); ast_config_destroy(cfg);
return NULL; return NULL;
@@ -483,8 +493,8 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
ESCAPE_STRING(buf, newval); ESCAPE_STRING(buf, newval);
ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, ast_str_buffer(buf)); ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, ast_str_buffer(buf));
while ((newparam = va_arg(ap, const char *))) { while ((newparam = va_arg(aq, const char *))) {
newval = va_arg(ap, const char *); newval = va_arg(aq, const char *);
if (!strchr(newparam, ' ')) op = " ="; else op = ""; if (!strchr(newparam, ' ')) op = " ="; else op = "";
ESCAPE_STRING(buf, newval); ESCAPE_STRING(buf, newval);
ast_str_append(&sql, 0, " AND %s%s '%s'", newparam, op, ast_str_buffer(buf)); ast_str_append(&sql, 0, " AND %s%s '%s'", newparam, op, ast_str_buffer(buf));
@@ -499,6 +509,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
/* Execution. */ /* Execution. */
if (mysql_real_query(&dbh->handle, ast_str_buffer(sql), ast_str_strlen(sql))) { if (mysql_real_query(&dbh->handle, ast_str_buffer(sql), ast_str_strlen(sql))) {
ast_log(LOG_WARNING, "MySQL RealTime: Failed to query database: %s\n", mysql_error(&dbh->handle)); ast_log(LOG_WARNING, "MySQL RealTime: Failed to query database: %s\n", mysql_error(&dbh->handle));
va_end(aq);
release_database(dbh); release_database(dbh);
ast_config_destroy(cfg); ast_config_destroy(cfg);
return NULL; return NULL;
@@ -534,6 +545,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char
ast_debug(1, "MySQL RealTime: Could not find any rows in table %s.\n", table); ast_debug(1, "MySQL RealTime: Could not find any rows in table %s.\n", table);
} }
va_end(aq);
release_database(dbh); release_database(dbh);
mysql_free_result(result); mysql_free_result(result);
@@ -548,6 +560,7 @@ static int update_mysql(const char *database, const char *tablename, const char
struct ast_str *sql = ast_str_thread_get(&sql_buf, 100), *buf = ast_str_thread_get(&scratch_buf, 100); struct ast_str *sql = ast_str_thread_get(&sql_buf, 100), *buf = ast_str_thread_get(&scratch_buf, 100);
struct tables *table; struct tables *table;
struct columns *column = NULL; struct columns *column = NULL;
va_list aq;
if (!(dbh = find_database(database, 1))) { if (!(dbh = find_database(database, 1))) {
ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database); ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
@@ -574,8 +587,10 @@ static int update_mysql(const char *database, const char *tablename, const char
} }
/* Get the first parameter and first value in our list of passed paramater/value pairs */ /* Get the first parameter and first value in our list of passed paramater/value pairs */
if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) { va_copy(aq, ap);
if (!(newparam = va_arg(aq, const char *)) || !(newval = va_arg(aq, const char *))) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime update requires at least 1 parameter and 1 value to update.\n"); ast_log(LOG_WARNING, "MySQL RealTime: Realtime update requires at least 1 parameter and 1 value to update.\n");
va_end(aq);
release_table(table); release_table(table);
release_database(dbh); release_database(dbh);
return -1; return -1;
@@ -584,6 +599,7 @@ static int update_mysql(const char *database, const char *tablename, const char
/* Check that the column exists in the table */ /* Check that the column exists in the table */
if (!(column = find_column(table, newparam))) { if (!(column = find_column(table, newparam))) {
ast_log(LOG_ERROR, "MySQL RealTime: Updating column '%s', but that column does not exist within the table '%s' (first pair MUST exist)!\n", newparam, tablename); ast_log(LOG_ERROR, "MySQL RealTime: Updating column '%s', but that column does not exist within the table '%s' (first pair MUST exist)!\n", newparam, tablename);
va_end(aq);
release_table(table); release_table(table);
release_database(dbh); release_database(dbh);
return -1; return -1;
@@ -591,6 +607,7 @@ static int update_mysql(const char *database, const char *tablename, const char
/* Must connect to the server before anything else, as the escape function requires the mysql handle. */ /* Must connect to the server before anything else, as the escape function requires the mysql handle. */
if (!mysql_reconnect(dbh)) { if (!mysql_reconnect(dbh)) {
va_end(aq);
release_table(table); release_table(table);
release_database(dbh); release_database(dbh);
return -1; return -1;
@@ -607,8 +624,8 @@ static int update_mysql(const char *database, const char *tablename, const char
internal_require(database, tablename, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL); internal_require(database, tablename, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
} }
while ((newparam = va_arg(ap, const char *))) { while ((newparam = va_arg(aq, const char *))) {
newval = va_arg(ap, const char *); newval = va_arg(aq, const char *);
/* If the column is not within the table, then skip it */ /* If the column is not within the table, then skip it */
if (!(column = find_column(table, newparam))) { if (!(column = find_column(table, newparam))) {
@@ -625,6 +642,8 @@ static int update_mysql(const char *database, const char *tablename, const char
} }
} }
va_end(aq);
ESCAPE_STRING(buf, lookup); ESCAPE_STRING(buf, lookup);
ast_str_append(&sql, 0, " WHERE `%s` = '%s'", keyfield, ast_str_buffer(buf)); ast_str_append(&sql, 0, " WHERE `%s` = '%s'", keyfield, ast_str_buffer(buf));
@@ -663,6 +682,7 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
struct ast_str *where = ast_str_thread_get(&sql2_buf, 100); struct ast_str *where = ast_str_thread_get(&sql2_buf, 100);
struct tables *table; struct tables *table;
struct columns *column = NULL; struct columns *column = NULL;
va_list aq;
if (!tablename) { if (!tablename) {
ast_log(LOG_WARNING, "MySQL RealTime: No table specified.\n"); ast_log(LOG_WARNING, "MySQL RealTime: No table specified.\n");
@@ -697,15 +717,18 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
} }
first = 1; first = 1;
while ((newparam = va_arg(ap, const char *))) { va_copy(aq, ap);
while ((newparam = va_arg(aq, const char *))) {
if (!(column = find_column(table, newparam))) { if (!(column = find_column(table, newparam))) {
ast_log(LOG_ERROR, "Updating on column '%s', but that column does not exist within the table '%s'!\n", newparam, tablename); ast_log(LOG_ERROR, "Updating on column '%s', but that column does not exist within the table '%s'!\n", newparam, tablename);
va_end(aq);
release_table(table); release_table(table);
release_database(dbh); release_database(dbh);
return -1; return -1;
} }
if (!(newval = va_arg(ap, const char *))) { if (!(newval = va_arg(aq, const char *))) {
ast_log(LOG_ERROR, "Invalid arguments: no value specified for column '%s' on '%s@%s'\n", newparam, tablename, database); ast_log(LOG_ERROR, "Invalid arguments: no value specified for column '%s' on '%s@%s'\n", newparam, tablename, database);
va_end(aq);
release_table(table); release_table(table);
release_database(dbh); release_database(dbh);
return -1; return -1;
@@ -721,9 +744,10 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
} }
first = 1; first = 1;
while ((newparam = va_arg(ap, const char *))) { while ((newparam = va_arg(aq, const char *))) {
if (!(newval = va_arg(ap, const char *))) { if (!(newval = va_arg(aq, const char *))) {
ast_log(LOG_ERROR, "Invalid arguments: no value specified for column '%s' on '%s@%s'\n", newparam, tablename, database); ast_log(LOG_ERROR, "Invalid arguments: no value specified for column '%s' on '%s@%s'\n", newparam, tablename, database);
va_end(aq);
release_table(table); release_table(table);
release_database(dbh); release_database(dbh);
return -1; return -1;
@@ -745,6 +769,8 @@ static int update2_mysql(const char *database, const char *tablename, va_list ap
} }
} }
va_end(aq);
release_table(table); release_table(table);
ast_str_append(&sql, 0, " %s", ast_str_buffer(where)); ast_str_append(&sql, 0, " %s", ast_str_buffer(where));
@@ -781,6 +807,7 @@ static int store_mysql(const char *database, const char *table, va_list ap)
struct ast_str *sql2 = ast_str_thread_get(&sql2_buf, 16); struct ast_str *sql2 = ast_str_thread_get(&sql2_buf, 16);
struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16); struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16);
const char *newparam, *newval; const char *newparam, *newval;
va_list aq;
if (!(dbh = find_database(database, 1))) { if (!(dbh = find_database(database, 1))) {
ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database); ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
@@ -793,13 +820,16 @@ static int store_mysql(const char *database, const char *table, va_list ap)
return -1; return -1;
} }
/* Get the first parameter and first value in our list of passed paramater/value pairs */ /* Get the first parameter and first value in our list of passed paramater/value pairs */
if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) { va_copy(aq, ap);
if (!(newparam = va_arg(aq, const char *)) || !(newval = va_arg(aq, const char *))) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime storage requires at least 1 parameter and 1 value to search on.\n"); ast_log(LOG_WARNING, "MySQL RealTime: Realtime storage requires at least 1 parameter and 1 value to search on.\n");
va_end(aq);
release_database(dbh); release_database(dbh);
return -1; return -1;
} }
/* Must connect to the server before anything else, as the escape function requires the mysql handle. */ /* Must connect to the server before anything else, as the escape function requires the mysql handle. */
if (!mysql_reconnect(dbh)) { if (!mysql_reconnect(dbh)) {
va_end(aq);
release_database(dbh); release_database(dbh);
return -1; return -1;
} }
@@ -811,8 +841,8 @@ static int store_mysql(const char *database, const char *table, va_list ap)
internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL); internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
while ((newparam = va_arg(ap, const char *))) { while ((newparam = va_arg(aq, const char *))) {
if ((newval = va_arg(ap, const char *))) { if ((newval = va_arg(aq, const char *))) {
ESCAPE_STRING(buf, newval); ESCAPE_STRING(buf, newval);
} else { } else {
ast_str_reset(buf); ast_str_reset(buf);
@@ -822,6 +852,7 @@ static int store_mysql(const char *database, const char *table, va_list ap)
ast_str_append(&sql2, 0, ", '%s'", ast_str_buffer(buf)); ast_str_append(&sql2, 0, ", '%s'", ast_str_buffer(buf));
} }
} }
va_end(aq);
ast_str_append(&sql, 0, "%s)", ast_str_buffer(sql2)); ast_str_append(&sql, 0, "%s)", ast_str_buffer(sql2));
ast_debug(1,"MySQL RealTime: Insert SQL: %s\n", ast_str_buffer(sql)); ast_debug(1,"MySQL RealTime: Insert SQL: %s\n", ast_str_buffer(sql));
@@ -853,6 +884,7 @@ static int destroy_mysql(const char *database, const char *table, const char *ke
struct ast_str *sql = ast_str_thread_get(&sql_buf, 16); struct ast_str *sql = ast_str_thread_get(&sql_buf, 16);
struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16); struct ast_str *buf = ast_str_thread_get(&scratch_buf, 16);
const char *newparam, *newval; const char *newparam, *newval;
va_list aq;
if (!(dbh = find_database(database, 1))) { if (!(dbh = find_database(database, 1))) {
ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database); ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
@@ -866,8 +898,8 @@ static int destroy_mysql(const char *database, const char *table, const char *ke
} }
/* Get the first parameter and first value in our list of passed paramater/value pairs */ /* Get the first parameter and first value in our list of passed paramater/value pairs */
/* newparam = va_arg(ap, const char *); /* newparam = va_arg(aq, const char *);
newval = va_arg(ap, const char *);*/ newval = va_arg(aq, const char *);*/
if (ast_strlen_zero(keyfield) || ast_strlen_zero(lookup)) { if (ast_strlen_zero(keyfield) || ast_strlen_zero(lookup)) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime destroying requires at least 1 parameter and 1 value to search on.\n"); ast_log(LOG_WARNING, "MySQL RealTime: Realtime destroying requires at least 1 parameter and 1 value to search on.\n");
release_database(dbh); release_database(dbh);
@@ -884,11 +916,13 @@ static int destroy_mysql(const char *database, const char *table, const char *ke
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */ If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, lookup); ESCAPE_STRING(buf, lookup);
ast_str_set(&sql, 0, "DELETE FROM %s WHERE `%s` = '%s'", table, keyfield, ast_str_buffer(buf)); ast_str_set(&sql, 0, "DELETE FROM %s WHERE `%s` = '%s'", table, keyfield, ast_str_buffer(buf));
while ((newparam = va_arg(ap, const char *))) { va_copy(aq, ap);
newval = va_arg(ap, const char *); while ((newparam = va_arg(aq, const char *))) {
newval = va_arg(aq, const char *);
ESCAPE_STRING(buf, newval); ESCAPE_STRING(buf, newval);
ast_str_append(&sql, 0, " AND `%s` = '%s'", newparam, ast_str_buffer(buf)); ast_str_append(&sql, 0, " AND `%s` = '%s'", newparam, ast_str_buffer(buf));
} }
va_end(aq);
ast_debug(1, "MySQL RealTime: Delete SQL: %s\n", ast_str_buffer(sql)); ast_debug(1, "MySQL RealTime: Delete SQL: %s\n", ast_str_buffer(sql));
@@ -1109,15 +1143,17 @@ static int require_mysql(const char *database, const char *tablename, va_list ap
struct tables *table = find_table(database, tablename); struct tables *table = find_table(database, tablename);
char *elm; char *elm;
int type, size, res = 0, table_altered = 0; int type, size, res = 0, table_altered = 0;
va_list aq;
if (!table) { if (!table) {
ast_log(LOG_WARNING, "Table %s not found in database. This table should exist if you're using realtime.\n", tablename); ast_log(LOG_WARNING, "Table %s not found in database. This table should exist if you're using realtime.\n", tablename);
return -1; return -1;
} }
while ((elm = va_arg(ap, char *))) { va_copy(aq, ap);
type = va_arg(ap, require_type); while ((elm = va_arg(aq, char *))) {
size = va_arg(ap, int); type = va_arg(aq, require_type);
size = va_arg(aq, int);
AST_LIST_TRAVERSE(&table->columns, column, list) { AST_LIST_TRAVERSE(&table->columns, column, list) {
if (strcmp(column->name, elm) == 0) { if (strcmp(column->name, elm) == 0) {
/* Char can hold anything, as long as it is large enough */ /* Char can hold anything, as long as it is large enough */
@@ -1338,6 +1374,7 @@ static int require_mysql(const char *database, const char *tablename, va_list ap
} }
} }
} }
va_end(aq);
release_table(table); release_table(table);
/* If we altered the table, we must refresh the cache */ /* If we altered the table, we must refresh the cache */