kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

config.c: Fix potential memory corruption after [section](+).

Browse Source 
The memory corruption could happen if the [section](+) is the last section
in the file with trailing comments.  In this case process_text_line() has
left *last_cat is set to newcat and newcat is destroyed.

Change-Id: I0d1d999f553986f591becd000e7cc6ddfb978d93
This commit is contained in:
Richard Mudgett
2015-10-12 11:20:29 -05:00
parent c1ed11ee31
commit 9951255775
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
main/config.c
View File

@@ -1647,7 +1647,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
* You can put a comma-separated list of categories and templates * You can put a comma-separated list of categories and templates
* and '!' and '+' between parentheses, with obvious meaning. * and '!' and '+' between parentheses, with obvious meaning.
*/ */
struct ast_category *newcat = NULL; struct ast_category *newcat;
char *catname; char *catname;
c = strchr(cur, ']'); c = strchr(cur, ']');
@@ -1660,14 +1660,13 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
if (*c++ != '(') if (*c++ != '(')
c = NULL; c = NULL;
catname = cur; catname = cur;
if (!(*cat = newcat = ast_category_new(catname, *cat = newcat = ast_category_new(catname,
S_OR(suggested_include_file, cfg->include_level == 1 ? "" : configfile), S_OR(suggested_include_file, cfg->include_level == 1 ? "" : configfile),
lineno))) { lineno);
if (!newcat) {
return -1; return -1;
} }
(*cat)->lineno = lineno; (*cat)->lineno = lineno;
*last_var = 0;
*last_cat = newcat;
/* add comments */ /* add comments */
if (ast_test_flag(&flags, CONFIG_FLAG_WITHCOMMENTS)) if (ast_test_flag(&flags, CONFIG_FLAG_WITHCOMMENTS))
@@ -1690,8 +1689,9 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
} else if (!strcasecmp(cur, "+")) { } else if (!strcasecmp(cur, "+")) {
*cat = ast_category_get(cfg, catname, NULL); *cat = ast_category_get(cfg, catname, NULL);
if (!(*cat)) { if (!(*cat)) {
if (newcat) if (newcat) {
ast_category_destroy(newcat); ast_category_destroy(newcat);
}
ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile); ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile);
return -1; return -1;
} }
@@ -1717,8 +1717,19 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
} }
} }
} }
if (newcat)
ast_category_append(cfg, *cat); /*
* We need to set *last_cat to newcat here regardless. If the
* category is being appended to we have no place for trailing
* comments on the appended category. The appended category
* may be in another file or it already has trailing comments
* that we would then leak.
*/
*last_var = NULL;
*last_cat = newcat;
if (newcat) {
ast_category_append(cfg, newcat);
}
} else if (cur[0] == '#') { /* A directive - #include or #exec */ } else if (cur[0] == '#') { /* A directive - #include or #exec */
char *cur2; char *cur2;
char real_inclusion_name[256]; char real_inclusion_name[256];
@@ -1874,7 +1885,7 @@ set_new_variable:
} else if ((v = ast_variable_new(cur, ast_strip(c), S_OR(suggested_include_file, cfg->include_level == 1 ? "" : configfile)))) { } else if ((v = ast_variable_new(cur, ast_strip(c), S_OR(suggested_include_file, cfg->include_level == 1 ? "" : configfile)))) {
v->lineno = lineno; v->lineno = lineno;
v->object = object; v->object = object;
*last_cat = 0; *last_cat = NULL;
*last_var = v; *last_var = v;
/* Put and reset comments */ /* Put and reset comments */
v->blanklines = 0; v->blanklines = 0;
@@ -1914,8 +1925,8 @@ static struct ast_config *config_text_file_load(const char *database, const char
struct stat statbuf; struct stat statbuf;
struct cache_file_mtime *cfmtime = NULL; struct cache_file_mtime *cfmtime = NULL;
struct cache_file_include *cfinclude; struct cache_file_include *cfinclude;
struct ast_variable *last_var = 0; struct ast_variable *last_var = NULL;
struct ast_category *last_cat = 0; struct ast_category *last_cat = NULL;
/*! Growable string buffer */ /*! Growable string buffer */
struct ast_str *comment_buffer = NULL; /*!< this will be a comment collector.*/ struct ast_str *comment_buffer = NULL; /*!< this will be a comment collector.*/
struct ast_str *lline_buffer = NULL; /*!< A buffer for stuff behind the ; */ struct ast_str *lline_buffer = NULL; /*!< A buffer for stuff behind the ; */