diff options
| author | Mark Michelson <mmichelson@digium.com> | 2014-05-02 20:28:23 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2014-05-02 20:28:23 +0000 |
| commit | ff1841fcfb5d2b5fdd81e2da945c7e44d48b0166 (patch) | |
| tree | 866ff13b217d81a7516e026e496e14e9045e3a2a /res/res_config_odbc.c | |
| parent | ff1658ed3b681e5083546c9d62899c3cd6a932c3 (diff) | |
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
Diffstat (limited to 'res/res_config_odbc.c')
| -rw-r--r-- | res/res_config_odbc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 5289f6d81..7f6093a10 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; |