diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-10-24 17:00:27 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-10-24 17:00:27 +0000 |
| commit | 4ca0f222e85554e24d5cfb7d48b3a774d96a6e45 (patch) | |
| tree | 411b1a8a88241acde89163243e464edce21486d4 /main/app.c | |
| parent | beb5cdbef54908cc1564539f9cfb8852b530f2bc (diff) | |
memory leaks: Memory leak cleanup patch by Corey Farrell (second set)
Also covers ast_app_parse_timelen-fail-zero-length.patch, but the patch was
replaced with one of my own.
(issue ASTERISK-22467)
Reported by: Corey Farrell
Patches:
chan_dahdi-cleanup_push.patch uploaded by coreyfarrell (license 5909)
clicompat-r2.patch uploaded by coreyfarrell (license 5909)
codecs-ilbc-doCPLC.patch uploaded by coreyfarrell (license 5909)
data-cleanup-test-registration.patch uploaded by coreyfarrell (license 5909)
main-asterisk-kill-listener.patch uploaded by coreyfarrell (license 5909)
........
Merged revisions 401704 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401705 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401706 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/app.c b/main/app.c index 69e312de9..6f70b2101 100644 --- a/main/app.c +++ b/main/app.c @@ -2786,7 +2786,9 @@ int ast_app_parse_timelen(const char *timestr, int *result, enum ast_timelen uni return -1; } - if ((res = sscanf(timestr, FMT, &amount, u)) == 0) { + res = sscanf(timestr, FMT, &amount, u); + + if (res == 0 || res == EOF) { #undef FMT return -1; } else if (res == 2) { |