diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-03-20 18:27:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-03-20 18:27:22 +0000 |
| commit | 148e8799fefb48fd324ce9b8813d1919ba72a8fd (patch) | |
| tree | ecc529edefd38e53f2468cb2fef8fba09f547e1e /main/xmldoc.c | |
| parent | 627cc16a8d4c3fa40144b8f4ec1fe511cbf783a3 (diff) | |
res_pjsip_sdp_rtp,sorcery: Fix invalid access and memory leak respectively.
Valgrind found a memory leak and invalid access.
* Fix invalid access by sscanf() being fed a non-nul terminated string of
digits in res/res_pjsip_sdp_rtp.c:get_codecs().
* Fix memory leak in main/sorcery.c:sorcery_object_field_destructor().
* Fix potential NULL pointer dereference in
main/xmldoc.c:xmldoc_get_syntax_config_option().
Review: https://reviewboard.asterisk.org/r/4513/
........
Merged revisions 433199 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/xmldoc.c')
| -rw-r--r-- | main/xmldoc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/xmldoc.c b/main/xmldoc.c index 395df8ea0..e334e878e 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -1239,7 +1239,7 @@ static char *xmldoc_get_syntax_config_option(struct ast_xml_node *fixnode, const regex = ast_xml_get_attribute(fixnode, "regex"); ast_str_set(&syntax, 0, "%s = [%s] (Default: %s) (Regex: %s)\n", name, - type, + type ?: "", default_value ?: "n/a", regex ?: "False"); |