From c41040fd4b9a4f14bbd0be30500361154d823595 Mon Sep 17 00:00:00 2001 From: Scott Griepentrog Date: Fri, 14 Feb 2014 21:29:31 +0000 Subject: [PATCH] format.c: correct possible null pointer dereference In ast_format_sdp_parse and ast_format_sdp_generate the check checks for a valid interface and function were potentially confusing, and hid an error in the test of the presence of the function that is called later. This patch clears up and corrects the test. Review: https://reviewboard.asterisk.org/r/3208/ (closes issue ASTERISK-23098) Reported by: marcelloceschia Patches: main_format.patch uploaded by marcelloceschia (license 6036) ASTERISK-23098.patch uploaded by coreyfarrell (license 5909) ........ Merged revisions 408137 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 408138 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@408139 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/format.c b/main/format.c index 07bc38eb7f..5791410706 100644 --- a/main/format.c +++ b/main/format.c @@ -129,7 +129,7 @@ int ast_format_sdp_parse(struct ast_format *format, const char *attributes) } ao2_rdlock(wrapper); - if (!(wrapper->interface || !wrapper->interface->format_attr_sdp_parse)) { + if (!wrapper->interface || !wrapper->interface->format_attr_sdp_parse) { ao2_unlock(wrapper); ao2_ref(wrapper, -1); return 0; @@ -152,7 +152,7 @@ void ast_format_sdp_generate(const struct ast_format *format, unsigned int paylo } ao2_rdlock(wrapper); - if (!(wrapper->interface || !wrapper->interface->format_attr_sdp_generate)) { + if (!wrapper->interface || !wrapper->interface->format_attr_sdp_generate) { ao2_unlock(wrapper); ao2_ref(wrapper, -1); return;