[svn-commits] sgriepentrog: branch 12 r408138 - in /branches/12: ./ main/format.c

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Fri Feb 14 15:28:18 2014
New Revision: 408138

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408138
Log:
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.

(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

Modified:
    branches/12/   (props changed)
    branches/12/main/format.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/format.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/format.c?view=diff&rev=408138&r1=408137&r2=408138
==============================================================================
--- branches/12/main/format.c (original)
+++ branches/12/main/format.c Fri Feb 14 15:28:18 2014
@@ -129,7 +129,7 @@
 	}
 
 	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 @@
 	}
 
 	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;