kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang compiler warnings: Fix sometimes-uninitialized warning in pbx_config

Browse Source 
This patch fixes a warning caught by clang, in which a char pointer could be
assigned to before it was initialized. The patch re-organizes the code to
ensure that the pointer is always initialized, even on off nominal paths.

Review: https://reviewboard.asterisk.org/r/4529

ASTERISK-24917
Reported by: dkdegroot
patches:
  rb4529.patch submitted by dkdegroot (License 6600)
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2015-04-06 18:03:37 +00:00
parent 4e7be5b2dc
commit 0ecd472e4f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pbx/pbx_config.c
View File

@@ -956,7 +956,9 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
const char *el = ast_get_extension_label(p); const char *el = ast_get_extension_label(p);
char label[128] = ""; char label[128] = "";
char *appdata = ast_get_extension_app_data(p); char *appdata = ast_get_extension_app_data(p);
char *escaped;
int escaped_len = (!ast_strlen_zero(appdata)) ? 2 * strlen(appdata) + 1 : 1;
char escaped[escaped_len];
if (ast_get_extension_matchcid(p)) { if (ast_get_extension_matchcid(p)) {
sep = "/"; sep = "/";
@@ -970,12 +972,9 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
} }
if (!ast_strlen_zero(appdata)) { if (!ast_strlen_zero(appdata)) {
int escaped_len = 2 * strlen(appdata) + 1;
char escaped[escaped_len];
ast_escape_semicolons(appdata, escaped, escaped_len); ast_escape_semicolons(appdata, escaped, escaped_len);
} else { } else {
escaped = ""; escaped[0] = '\0';
} }
fprintf(output, "exten => %s%s%s,%d%s,%s(%s)\n", fprintf(output, "exten => %s%s%s,%d%s,%s(%s)\n",