[asterisk-commits] file: trunk r57799 - in /trunk: ./ main/slinfactory.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sun Mar  4 22:21:28 2007
New Revision: 57799

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57799
Log:
Merged revisions 57798 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57798 | file | 2007-03-04 23:19:53 -0500 (Sun, 04 Mar 2007) | 2 lines

Don't allow a NULL pointer to reach ast_frdup. (issue #9155 reported by cmaj)

........

Modified:
    trunk/   (props changed)
    trunk/main/slinfactory.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/slinfactory.c
URL: http://svn.digium.com/view/asterisk/trunk/main/slinfactory.c?view=diff&rev=57799&r1=57798&r2=57799
==============================================================================
--- trunk/main/slinfactory.c (original)
+++ trunk/main/slinfactory.c Sun Mar  4 22:21:28 2007
@@ -56,7 +56,7 @@
 
 int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
 {
-	struct ast_frame *frame, *frame_ptr;
+	struct ast_frame *begin_frame = f, *duped_frame = NULL, *frame_ptr;
 	unsigned int x;
 
 	if (f->subclass != AST_FORMAT_SLINEAR) {
@@ -74,16 +74,16 @@
 		}
 	}
 
-	if (!(frame = ast_frdup( (sf->trans) ? ast_translate(sf->trans, f, 0) : f )))
+	if ((sf->trans && (!(begin_frame = ast_translate(sf->trans, f, 0)))) || (!(duped_frame = ast_frdup(begin_frame))))
 		return 0;
 
 	x = 0;
 	AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list)
 		x++;
 
-	AST_LIST_INSERT_TAIL(&sf->queue, frame, frame_list);
+	AST_LIST_INSERT_TAIL(&sf->queue, duped_frame, frame_list);
 
-	sf->size += frame->samples;
+	sf->size += duped_frame->samples;
 
 	return x;
 }