diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-05-10 20:56:09 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-05-10 20:56:09 +0000 |
| commit | dd81b047dbf15a501b81354db505daf50703a1a0 (patch) | |
| tree | 01754d4206c865653717baf23e47ed264f7a6b3d /main/config.c | |
| parent | 8227f70cd70f497cb03c1f9aab63950bcd979d8b (diff) | |
Resolve FORWARD_NULL static analysis warnings
This resolves core findings from ASTERISK-19650 numbers 0-2, 6, 7, 9-11, 14-20,
22-24, 28, 30-32, 34-36, 42-56, 82-84, 87, 89-90, 93-102, 104, 105, 109-111,
and 115. Finding numbers 26, 33, and 29 were already resolved. Those skipped
were either extended/deprecated or in areas of code that shouldn't be
disturbed.
(Closes issue ASTERISK-19650)
........
Merged revisions 366167 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 366168 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@366169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/config.c b/main/config.c index a143927af..249cf0403 100644 --- a/main/config.c +++ b/main/config.c @@ -562,7 +562,11 @@ struct ast_variable *ast_variable_browse(const struct ast_config *config, const { struct ast_category *cat = NULL; - if (category && config->last_browse && (config->last_browse->name == category)) { + if (!category) { + return NULL; + } + + if (config->last_browse && (config->last_browse->name == category)) { cat = config->last_browse; } else { cat = ast_category_get(config, category); @@ -1898,7 +1902,7 @@ int ast_config_text_file_save(const char *configfile, const struct ast_config *c /* Dump section with any appropriate comment */ for (cmt = cat->precomments; cmt; cmt=cmt->next) { char *cmtp = cmt->cmt; - while (*cmtp == ';' && *(cmtp+1) == '!') { + while (cmtp && *cmtp == ';' && *(cmtp+1) == '!') { char *cmtp2 = strchr(cmtp+1, '\n'); if (cmtp2) cmtp = cmtp2+1; |