[asterisk-commits] tilghman: branch 1.4 r224855 - /branches/1.4/main/audiohook.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Oct 20 17:07:11 2009
New Revision: 224855

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224855
Log:
Pay attention to the return value of the manipulate function.
While this looks like an optimization, it prevents a crash from occurring
when used with certain audiohook callbacks (diagnosed with SVN trunk,
backported to 1.4 to keep the source consistent across versions).

Modified:
    branches/1.4/main/audiohook.c

Modified: branches/1.4/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/audiohook.c?view=diff&rev=224855&r1=224854&r2=224855
==============================================================================
--- branches/1.4/main/audiohook.c (original)
+++ branches/1.4/main/audiohook.c Tue Oct 20 17:07:11 2009
@@ -586,7 +586,7 @@
 	struct ast_frame *start_frame = frame, *middle_frame = frame, *end_frame = frame;
 	struct ast_audiohook *audiohook = NULL;
 	int samples = frame->samples;
-	
+
 	/* If the frame coming in is not signed linear we have to send it through the in_translate path */
 	if (frame->subclass != AST_FORMAT_SLINEAR) {
 		if (in_translate->format != frame->subclass) {
@@ -657,11 +657,17 @@
 				continue;
 			}
 			/* Feed in frame to manipulation */
-			audiohook->manipulate_callback(audiohook, chan, middle_frame, direction);
+			if (audiohook->manipulate_callback(audiohook, chan, middle_frame, direction)) {
+				/* Manipulation failed */
+				ast_frfree(middle_frame);
+				middle_frame = NULL;
+			}
 			ast_audiohook_unlock(audiohook);
 		}
 		AST_LIST_TRAVERSE_SAFE_END
-		end_frame = middle_frame;
+		if (middle_frame) {
+			end_frame = middle_frame;
+		}
 	}
 
 	/* Now we figure out what to do with our end frame (whether to transcode or not) */
@@ -689,7 +695,9 @@
 		}
 	} else {
 		/* No frame was modified, we can just drop our middle frame and pass the frame we got in out */
-		ast_frfree(middle_frame);
+		if (middle_frame) {
+			ast_frfree(middle_frame);
+		}
 	}
 
 	return end_frame;