From ddda9cee1c4b308921c37a61efda411244152e8f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 7 Jun 2015 15:00:30 +0200
Subject: [PATCH] ffserver: Check for ffio_set_buf_size() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
ffserver.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 9d0cb0b225d..3cb29e4726e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2065,7 +2065,13 @@ static int open_input_stream(HTTPContext *c, const char *info)
}
/* set buffer size */
- if (buf_size > 0) ffio_set_buf_size(s->pb, buf_size);
+ if (buf_size > 0) {
+ ret = ffio_set_buf_size(s->pb, buf_size);
+ if (ret < 0) {
+ http_log("Failed to set buffer size\n");
+ return ret;
+ }
+ }
s->flags |= AVFMT_FLAG_GENPTS;
c->fmt_in = s;
@@ -3595,7 +3601,12 @@ static void build_feed_streams(void)
if (avformat_open_input(&s, feed->feed_filename, NULL, NULL) >= 0) {
/* set buffer size */
- ffio_set_buf_size(s->pb, FFM_PACKET_SIZE);
+ int ret = ffio_set_buf_size(s->pb, FFM_PACKET_SIZE);
+ if (ret < 0) {
+ http_log("Failed to set buffer size\n");
+ exit(1);
+ }
+
/* Now see if it matches */
if (s->nb_streams == feed->nb_streams) {
matches = 1;
--
GitLab