Add missing failure checks to ast_str_set_va() callers.

Change-Id: I0c2cdcd53727bdc6634095c61294807255bd278f

diff --git a/main/manager.c b/main/manager.c
index 75b1d4d48e7cd5b1aa43b18670222270ac873455..8295303c763f6461db08f6cf81eaa7f72817f4b0 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -2811,6 +2811,7 @@ AST_THREADSTORAGE(userevent_buf);
  */
 void astman_append(struct mansession *s, const char *fmt, ...)
 {
+       int res;
        va_list ap;
        struct ast_str *buf;
 
@@ -2819,8 +2820,11 @@ void astman_append(struct mansession *s, const char *fmt, ...)
        }
 
        va_start(ap, fmt);
-       ast_str_set_va(&buf, 0, fmt, ap);
+       res = ast_str_set_va(&buf, 0, fmt, ap);
        va_end(ap);
+       if (res == AST_DYNSTR_BUILD_FAILED) {
+               return;
+       }
 
        if (s->f != NULL || s->session->f != NULL) {
                send_string(s, ast_str_buffer(buf));
@@ -2880,6 +2884,7 @@ void astman_send_error(struct mansession *s, const struct message *m, char *erro
 
 void astman_send_error_va(struct mansession *s, const struct message *m, const char *fmt, ...)
 {
+       int res;
        va_list ap;
        struct ast_str *buf;
        char *msg;
@@ -2889,8 +2894,11 @@ void astman_send_error_va(struct mansession *s, const struct message *m, const c
        }
 
        va_start(ap, fmt);
-       ast_str_set_va(&buf, 0, fmt, ap);
+       res = ast_str_set_va(&buf, 0, fmt, ap);
        va_end(ap);
+       if (res == AST_DYNSTR_BUILD_FAILED) {
+               return;
+       }
 
        /* astman_append will use the same underlying buffer, so copy the message out
         * before sending the response */

diff --git a/main/xmldoc.c b/main/xmldoc.c
index fcf1b2cacb197eff120edb2b2ad4e55945d1a05b..1a04e8168c1960ea612b5aa00e8c8fccae992261 100644 (file)
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -2646,14 +2646,18 @@ struct ast_xml_xpath_results *__attribute__((format(printf, 1, 2))) ast_xmldoc_q
        struct documentation_tree *doctree;
        RAII_VAR(struct ast_str *, xpath_str, ast_str_create(128), ast_free);
        va_list ap;
+       int res;
 
        if (!xpath_str) {
                return NULL;
        }
 
        va_start(ap, fmt);
-       ast_str_set_va(&xpath_str, 0, fmt, ap);
+       res = ast_str_set_va(&xpath_str, 0, fmt, ap);
        va_end(ap);
+       if (res == AST_DYNSTR_BUILD_FAILED) {
+               return NULL;
+       }
 
        AST_RWLIST_RDLOCK(&xmldoc_tree);
        AST_LIST_TRAVERSE(&xmldoc_tree, doctree, entry) {