aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-12-22 19:04:55 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-22 19:23:08 +0100
commitf9315ea984efc1a58499664e27b75c37295381db (patch)
tree0aab12cf181dcf47d4863aa91d6649bbfd5f7ce7
parent0abcebe3d62df01e7038cc78523e4445089f3b69 (diff)
downloadffmpeg-f9315ea984efc1a58499664e27b75c37295381db.tar.gz
ffserver_config: Check for failure to allocate FFServerIPAddressACL
Fixes CID1396537 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--ffserver_config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ffserver_config.c b/ffserver_config.c
index 05c6622fde..54135be989 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;