From d07b51bf0733fe58bbfa13c448775dc325463cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 30 Oct 2013 19:09:30 +0200
Subject: [PATCH] aviobuf: Handle a NULL buffer in avio_close_dyn_buf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
libavformat/aviobuf.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 5064eb826b3..0024f9e8b22 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));
--
GitLab