diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-22 16:07:59 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-22 16:07:59 +0000 |
| commit | 55fa1516d4e8fff4017ae7420ccd1f4c0c290bc4 (patch) | |
| tree | d0afc42ca56a3b05ca6b033bd47f7967032e376e /funcs | |
| parent | 9ef2f7f01616d456f14d95e4185fe3e445df2c1c (diff) | |
Fix a file playback crash and explicitly initialize values in func_timeout.c
A crash was brought up on the bugtracker. The first run through valgrind
was full of legitimate complaints of uninitialized values in func_timeout when
setting a response timeout. These were fixed but the crash persisted.
A second run through showed the real problem. The reference counting used
for filestreams was incorrect because there were some missing increments
when a frame was read from a format module.
(closes issue #14118)
Reported by: blitzrage
Patches:
14118v2.patch uploaded by putnopvut (license 60)
Tested by: blitzrage
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@166267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_timeout.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index a035a0563..2b3a000b4 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -119,11 +119,12 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data, static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { - double x; - long sec; + double x = 0.0; + long sec = 0L; char timestr[64]; struct ast_tm myt; - struct timeval when; + struct timeval when = {0,}; + int res; if (!chan) return -1; @@ -136,9 +137,13 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, if (!value) return -1; - if ((sscanf(value, "%ld%lf", &sec, &x) == 0) || sec < 0) + res = sscanf(value, "%ld%lf", &sec, &x); + if (res == 0 || sec < 0) { when.tv_sec = 0; - else { + when.tv_usec = 0; + } else if (res == 1) { + when.tv_sec = sec; + } else if (res == 2) { when.tv_sec = sec; when.tv_usec = x * 1000000; } |