[asterisk-commits] russell: trunk r289427 - in /trunk: ./ apps/app_sms.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Sep 30 10:40:10 2010
New Revision: 289427

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289427
Log:
Merged revisions 289426 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289426 | russell | 2010-09-30 10:39:45 -0500 (Thu, 30 Sep 2010) | 22 lines
  
  Merged revisions 289425 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289425 | russell | 2010-09-30 10:37:29 -0500 (Thu, 30 Sep 2010) | 15 lines
    
    Merged revisions 289424 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289424 | russell | 2010-09-30 10:34:29 -0500 (Thu, 30 Sep 2010) | 8 lines
      
      Fix a crash in app_sms.
      
      Since the data being passed to the generator callback is on the stack of the
      SMS() application, we must ensure that the generator is stopped before the
      application exits.
      
      ABE-2543
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_sms.c

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

Modified: trunk/apps/app_sms.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_sms.c?view=diff&rev=289427&r1=289426&r2=289427
==============================================================================
--- trunk/apps/app_sms.c (original)
+++ trunk/apps/app_sms.c Thu Sep 30 10:40:10 2010
@@ -2040,6 +2040,12 @@
 	}
 	res = h.err;                            /* XXX */
 
+	/* 
+	 * The SMS generator data is on the stack.  We _MUST_ make sure the generator
+	 * is stopped before returning from this function.
+	 */
+	ast_deactivate_generator(chan);
+
 	sms_log(&h, '?');                       /* log incomplete message */
 done:
 	return (res);