From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 2 May 2014 20:28:23 +0000 (+0000)
Subject: Prevent crashes in res_config_odbc due to uninitialized string fields.
X-Git-Tag: 13.0.0-beta1~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff1841fcfb5d2b5fdd81e2da945c7e44d48b0166;p=thirdparty%2Fasterisk.git

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
........

Merged revisions 413251 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 413258 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 5289f6d816..7f6093a103 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -691,6 +691,10 @@ static int store_odbc(const char *database, const char *table, const struct ast_
 		return -1;
 	}
 
+	if (ast_string_field_init(&cps, 256)) {
+		return -1;
+	}
+
 	obj = ast_odbc_request_obj2(database, connected_flag);
 	if (!obj) {
 		return -1;
@@ -756,6 +760,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;