virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffserver: break early on _parse_acl_row()

Browse Source 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet
2015-09-18 15:32:39 -07:00
parent c677b42f79
commit eb613877bf
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ffserver_config.c
View File

@@ -116,6 +116,8 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
{ {
char arg[1024]; char arg[1024];
FFServerIPAddressACL acl; FFServerIPAddressACL acl;
FFServerIPAddressACL *nacl;
FFServerIPAddressACL **naclp;
int errors = 0; int errors = 0;
ffserver_get_arg(arg, sizeof(arg), &p); ffserver_get_arg(arg, sizeof(arg), &p);
@@ -150,33 +152,35 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
} }
} }
if (!errors) { if (errors)
FFServerIPAddressACL *nacl = av_mallocz(sizeof(*nacl)); return;
FFServerIPAddressACL **naclp = 0;
acl.next = 0; nacl = av_mallocz(sizeof(*nacl));
*nacl = acl; naclp = 0;
if (stream) acl.next = 0;
naclp = &stream->acl; *nacl = acl;
else if (feed)
naclp = &feed->acl;
else if (ext_acl)
naclp = &ext_acl;
else {
fprintf(stderr, "%s:%d: ACL found not in <Stream> or <Feed>\n",
filename, line_num);
errors++;
}
if (naclp) { if (stream)
while (*naclp) naclp = &stream->acl;
naclp = &(*naclp)->next; else if (feed)
naclp = &feed->acl;
*naclp = nacl; else if (ext_acl)
} else naclp = &ext_acl;
av_free(nacl); else {
fprintf(stderr, "%s:%d: ACL found not in <Stream> or <Feed>\n",
filename, line_num);
errors++; /* FIXME: No effect whatsoever */
} }
if (naclp) {
while (*naclp)
naclp = &(*naclp)->next;
*naclp = nacl;
} else
av_free(nacl);
} }
/* add a codec and set the default parameters */ /* add a codec and set the default parameters */