[FFmpeg-cvslog] ffserver_config: Check for failure to allocate FFServerIPAddressACL

Michael Niedermayer git at videolan.org
Thu Dec 22 20:23:28 EET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Dec 22 19:04:55 2016 +0100| [f9315ea984efc1a58499664e27b75c37295381db] | committer: Michael Niedermayer

ffserver_config: Check for failure to allocate FFServerIPAddressACL

Fixes CID1396537

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9315ea984efc1a58499664e27b75c37295381db
---

 ffserver_config.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ffserver_config.c b/ffserver_config.c
index 05c6622..54135be 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -150,6 +150,11 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
     }
 
     nacl = av_mallocz(sizeof(*nacl));
+    if (!nacl) {
+        fprintf(stderr, "Failed to allocate FFServerIPAddressACL\n");
+        goto bail;
+    }
+
     naclp = 0;
 
     acl.next = 0;



More information about the ffmpeg-cvslog mailing list