streams: Ensure that stream is closed in ast_stream_and_wait on error
When ast_stream_and_wait returns an error (for example, when attempting to stream to a channel after hangup) the stream is not closed, and callers typically do not check the return code. This results in leaking file descriptors, leading to resource exhaustion. This change ensures that the stream is closed in case of error. ASTERISK-30198 #close Reported-by: Julien Alie Change-Id: Ie46b67314590ad75154595a3d34d461060b2e803
This commit is contained in:
parent
914c8e28c1
commit
b1f1556922
|
@ -80,6 +80,7 @@ int ast_streamfile(struct ast_channel *c, const char *filename, const char *pref
|
|||
* \brief stream file until digit
|
||||
* If the file name is non-empty, try to play it.
|
||||
* \note If digits == "" then we can simply check for non-zero.
|
||||
* \note If a failure is encountered, the stream will be closed before returning.
|
||||
* \retval 0 if success.
|
||||
* \retval -1 if error.
|
||||
* \retval digit if interrupted by a digit.
|
||||
|
|
|
@ -1862,6 +1862,10 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char *
|
|||
res = ast_waitstream(chan, digits);
|
||||
}
|
||||
}
|
||||
if (res == -1) {
|
||||
ast_stopstream(chan);
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue