diff options
author | Alexei Gradinari <alex2grad@gmail.com> | 2016-06-16 16:56:19 -0400 |
---|---|---|
committer | Alexei Gradinari <alex2grad@gmail.com> | 2016-06-20 13:06:00 -0400 |
commit | 5134a8043a81b5b3d0b70ae3fbf7564f2526469a (patch) | |
tree | 23b8a01a91b6e148f00187b1b624e66ea5753b6e /res | |
parent | 03953d80346b3561305606f8509ab3ea2fa962a1 (diff) |
fix: memory leaks, resource leaks, out of bounds and bugs
ASTERISK-26119 #close
Change-Id: Iecbf7d0f360a021147344c4e83ab242fd1e7512c
Diffstat (limited to 'res')
-rw-r--r-- | res/ael/pval.c | 70 | ||||
-rw-r--r-- | res/res_phoneprov.c | 5 | ||||
-rw-r--r-- | res/res_pjsip_sdp_rtp.c | 2 |
3 files changed, 56 insertions, 21 deletions
diff --git a/res/ael/pval.c b/res/ael/pval.c index d72ef0d59..07545f659 100644 --- a/res/ael/pval.c +++ b/res/ael/pval.c @@ -3355,9 +3355,9 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, #ifdef OLD_RAND_ACTION struct ael_priority *rand_test, *rand_end, *rand_skip; #endif - char *buf1; - char *buf2; - char *new_label; + RAII_VAR(char *, buf1, NULL, free); + RAII_VAR(char *, buf2, NULL, free); + RAII_VAR(char *, new_label, NULL, free); char *strp, *strp2; int default_exists; int local_control_statement_count; @@ -4191,9 +4191,6 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement, break; } } - free(buf1); - free(buf2); - free(new_label); return 0; } @@ -5052,7 +5049,10 @@ int pvalCheckType( pval *p, char *funcname, pvaltype type ) pval *pvalCreateNode( pvaltype type ) { pval *p = calloc(1,sizeof(pval)); /* why, oh why, don't I use ast_calloc? Way, way, way too messy if I do! */ - p->type = type; /* remember, this can be used externally or internally to asterisk */ + /* remember, this can be used externally or internally to asterisk */ + if (p) { + p->type = type; + } return p; } @@ -5413,14 +5413,30 @@ void pvalIncludesAddInclude( pval *p, const char *include ) void pvalIncludesAddIncludeWithTimeConstraints( pval *p, const char *include, char *hour_range, char *dom_range, char *dow_range, char *month_range ) { - pval *hr = pvalCreateNode(PV_WORD); - pval *dom = pvalCreateNode(PV_WORD); - pval *dow = pvalCreateNode(PV_WORD); - pval *mon = pvalCreateNode(PV_WORD); - pval *s = pvalCreateNode(PV_WORD); - - if (!pvalCheckType(p, "pvalIncludeAddIncludeWithTimeConstraints", PV_INCLUDES)) + pval *hr; + pval *dom; + pval *dow; + pval *mon; + pval *s; + + if (!pvalCheckType(p, "pvalIncludeAddIncludeWithTimeConstraints", PV_INCLUDES)) { + return; + } + + hr = pvalCreateNode(PV_WORD); + dom = pvalCreateNode(PV_WORD); + dow = pvalCreateNode(PV_WORD); + mon = pvalCreateNode(PV_WORD); + s = pvalCreateNode(PV_WORD); + + if (!hr || !dom || !dow || !mon || !s) { + destroy_pval(hr); + destroy_pval(dom); + destroy_pval(dow); + destroy_pval(mon); + destroy_pval(s); return; + } s->u1.str = (char *)include; p->u1.list = linku1(p->u1.list, s); @@ -5667,12 +5683,28 @@ char* pvalIfGetCondition( pval *p ) void pvalIfTimeSetCondition( pval *p, char *hour_range, char *dow_range, char *dom_range, char *mon_range ) /* time range format: 24-hour format begin-end|dow range|dom range|month range */ { - pval *hr = pvalCreateNode(PV_WORD); - pval *dow = pvalCreateNode(PV_WORD); - pval *dom = pvalCreateNode(PV_WORD); - pval *mon = pvalCreateNode(PV_WORD); - if (!pvalCheckType(p, "pvalIfTimeSetCondition", PV_IFTIME)) + pval *hr; + pval *dow; + pval *dom; + pval *mon; + + if (!pvalCheckType(p, "pvalIfTimeSetCondition", PV_IFTIME)) { return; + } + + hr = pvalCreateNode(PV_WORD); + dow = pvalCreateNode(PV_WORD); + dom = pvalCreateNode(PV_WORD); + mon = pvalCreateNode(PV_WORD); + + if (!hr || !dom || !dow || !mon) { + destroy_pval(hr); + destroy_pval(dom); + destroy_pval(dow); + destroy_pval(mon); + return; + } + pvalWordSetString(hr, hour_range); pvalWordSetString(dow, dow_range); pvalWordSetString(dom, dom_range); diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index df93c5bbc..71f875753 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -410,10 +410,13 @@ static int load_file(const char *filename, char **ret) fseek(f, 0, SEEK_END); len = ftell(f); fseek(f, 0, SEEK_SET); - if (!(*ret = ast_malloc(len + 1))) + if (!(*ret = ast_malloc(len + 1))) { + fclose(f); return -2; + } if (len != fread(*ret, sizeof(char), len, f)) { + fclose(f); free(*ret); *ret = NULL; return -3; diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index 18a7f3f6a..029eb5d27 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -420,7 +420,7 @@ static pjmedia_sdp_attr* generate_fmtp_attr(pj_pool_t *pool, struct ast_format * *++tmp = '\0'; /* ast...generate gives us everything, just need value */ tmp = strchr(ast_str_buffer(fmtp0), ':'); - if (tmp && tmp + 1) { + if (tmp && tmp[1] != '\0') { fmtp1 = pj_str(tmp + 1); } else { fmtp1 = pj_str(ast_str_buffer(fmtp0)); |