diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-09-19 08:22:51 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-09-19 08:22:51 -0500 |
| commit | 578429a54d78b04ee9aea2b652bc440ec5aeca95 (patch) | |
| tree | 32aa6b8fad7626a4200c0ab15ac22653492095e8 | |
| parent | fb6b5c684b8772ba008339a417725a208f72409e (diff) | |
| parent | c94f46080f60435fffd197d14441ccf9d963521b (diff) | |
Merge "CHAOS: avoid crash if string create fails" into 13
| -rw-r--r-- | res/res_config_sqlite.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index fe2fb3cdb..b97ef7a86 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -781,8 +781,16 @@ static int cdr_handler(struct ast_cdr *cdr) struct ast_str *sql1 = ast_str_create(160), *sql2 = ast_str_create(16); int first = 1; + if (!sql1 || !sql2) { + ast_free(sql1); + ast_free(sql2); + return -1; + } + if (!tbl) { ast_log(LOG_WARNING, "No such table: %s\n", cdr_table); + ast_free(sql1); + ast_free(sql2); return -1; } |