[svn-commits] russell: branch 1.6.1 r138158 - in /branches/1.6.1: ./ main/autoservice.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Aug 15 15:21:38 2008
New Revision: 138158

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138158
Log:
Merged revisions 138028 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r138028 | russell | 2008-08-15 10:09:46 -0500 (Fri, 15 Aug 2008) | 17 lines

Merged revisions 138027 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138027 | russell | 2008-08-15 10:07:16 -0500 (Fri, 15 Aug 2008) | 9 lines

Ensure that when a hangup occurs in autoservice, that a hangup frame gets
properly deferred to be read from the channel owner when it gets taken out
of autoservice.

(closes issue #12874)
Reported by: dimas
Patches: 
      v1-12874.patch uploaded by dimas (license 88)

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/autoservice.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Aug 15 15:21:38 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138086,138124,138148
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148

Modified: branches/1.6.1/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/autoservice.c?view=diff&rev=138158&r1=138157&r2=138158
==============================================================================
--- branches/1.6.1/main/autoservice.c (original)
+++ branches/1.6.1/main/autoservice.c Fri Aug 15 15:21:38 2008
@@ -152,14 +152,7 @@
 			}
 		}
 
-		if (!defer_frame) {
-			if (f) {
-				ast_frfree(f);
-			}
-			continue;
-		}
-
-		if (f) {
+		if (defer_frame) {
 			for (i = 0; i < x; i++) {
 				struct ast_frame *dup_f;
 				
@@ -167,12 +160,15 @@
 					continue;
 				}
 				
-				if ((dup_f = ast_frdup(f))) {
+				if ((dup_f = ast_frdup(defer_frame))) {
 					AST_LIST_INSERT_TAIL(&ents[i]->deferred_frames, dup_f, frame_list);
 				}
 				
 				break;
 			}
+		}
+
+		if (f) {
 			ast_frfree(f);
 		}
 	}