diff options
| author | Martin Storsjö <martin@martin.st> | 2013-10-30 19:09:30 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-11-01 09:56:27 +0200 |
| commit | d07b51bf0733fe58bbfa13c448775dc325463cb4 (patch) | |
| tree | edc522a1a85fc8b04333b6a420cb4842faab35d6 | |
| parent | 28240a60c1b5ce276e947ba013271ec009adc078 (diff) | |
| download | ffmpeg-d07b51bf0733fe58bbfa13c448775dc325463cb4.tar.gz | |
aviobuf: Handle a NULL buffer in avio_close_dyn_buf
This simplifies proper error handling in rtsp.c/rtspdec.c. When
broadcasting over RTSP in TCP mode, the AVIOContext is closed and
recreated for each sent packet, and if the recreation fails, we might
try to close a NULL buffer when freeing things at the end.
Previously, if recreating the buffer in rtspdec.c failed, this would
crash later due to trying to close a NULL buffer.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/aviobuf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 5064eb826b..0024f9e8b2 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -964,6 +964,11 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0}; int padding = 0; + if (!s) { + *pbuffer = NULL; + return 0; + } + /* don't attempt to pad fixed-size packet buffers */ if (!s->max_packet_size) { avio_write(s, padbuf, sizeof(padbuf)); |