dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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-2587
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@289427 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2010-09-30 15:40:10 +00:00
parent ed98462df2
commit c3136e840c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_sms.c
View File

@ -2040,6 +2040,12 @@ static int sms_exec(struct ast_channel *chan, const char *data)
}
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);