sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config.c: Prevent UB in ast_realtime_require_field. 

A backend's implementation of the realtime 'require' function may call
va_arg() and then fail, leaving the va_list in an undefined
state. Pass a copy of the va_list instead.

ASTERISK-29771 #close

Change-Id: I555565a72af84e96d49f62fe8cb66ba5a78461f4
This commit is contained in:
Sean Bright 2021-11-28 15:52:24 -05:00 committed by Friendly Automation
parent 70cdb0f9a8
commit 04ac4fe509
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/config.c
View File

@ -3384,16 +3384,19 @@ int ast_realtime_require_field(const char *family, ...)
struct ast_config_engine *eng;
char db[256];
char table[256];
va_list ap;
va_list ap, aq;
int res = -1, i;
va_start(ap, family);
for (i = 1; ; i++) {
if ((eng = find_engine(family, i, db, sizeof(db), table, sizeof(table)))) {
va_copy(aq, ap);
/* If the require succeeds, it returns 0. */
if (eng->require_func && !(res = eng->require_func(db, table, ap))) {
if (eng->require_func && !(res = eng->require_func(db, table, aq))) {
va_end(aq);
break;
}
va_end(aq);
} else {
break;
}