From b57c1dd870bfbb677f095c6a728a6e05af5b7103 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 2 May 2014 20:25:00 +0000 Subject: [PATCH] Prevent crashes in res_config_odbc due to uninitialized string fields. Patches: odbc-crash.patch by John Hardin (License #6512) ........ Merged revisions 413241 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@413251 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_config_odbc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 0f522e5ccf..59f39fe4d6 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -744,6 +744,10 @@ static int store_odbc(const char *database, const char *table, va_list ap) return -1; } + if (ast_string_field_init(&cps, 256)) { + return -1; + } + obj = ast_odbc_request_obj2(database, connected_flag); if (!obj) { return -1; @@ -824,6 +828,10 @@ static int destroy_odbc(const char *database, const char *table, const char *key return -1; } + if (ast_string_field_init(&cps, 256)) { + return -1; + } + obj = ast_odbc_request_obj2(database, connected_flag); if (!obj) { return -1; -- 2.47.3