virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-01 18:11:48 +02:00
parent 5b32558fd8
commit 5b911f1d5b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/webmdashenc.c
View File

@ -271,7 +271,8 @@ static int to_integer(char *p, int len)
{ {
int ret; int ret;
char *q = av_malloc(sizeof(char) * len); char *q = av_malloc(sizeof(char) * len);
if (!q) return -1; if (!q)
return AVERROR(ENOMEM);
av_strlcpy(q, p, len); av_strlcpy(q, p, len);
ret = atoi(q); ret = atoi(q);
av_free(q); av_free(q);
@ -291,7 +292,8 @@ static int parse_adaptation_sets(AVFormatContext *s)
continue; continue;
else if (state == new_set && !strncmp(p, "id=", 3)) { else if (state == new_set && !strncmp(p, "id=", 3)) {
w->as = av_realloc(w->as, sizeof(*w->as) * ++w->nb_as); w->as = av_realloc(w->as, sizeof(*w->as) * ++w->nb_as);
if (w->as == NULL) return -1; if (w->as == NULL)
return AVERROR(ENOMEM);
w->as[w->nb_as - 1].nb_streams = 0; w->as[w->nb_as - 1].nb_streams = 0;
w->as[w->nb_as - 1].streams = NULL; w->as[w->nb_as - 1].streams = NULL;
p += 3; // consume "id=" p += 3; // consume "id="
@ -308,7 +310,8 @@ static int parse_adaptation_sets(AVFormatContext *s)
q = p; q = p;
while (*q != '\0' && *q != ',' && *q != ' ') q++; while (*q != '\0' && *q != ',' && *q != ' ') q++;
as->streams = av_realloc(as->streams, sizeof(*as->streams) * ++as->nb_streams); as->streams = av_realloc(as->streams, sizeof(*as->streams) * ++as->nb_streams);
if (as->streams == NULL) return -1; if (as->streams == NULL)
return AVERROR(ENOMEM);
as->streams[as->nb_streams - 1] = to_integer(p, q - p + 1); as->streams[as->nb_streams - 1] = to_integer(p, q - p + 1);
if (as->streams[as->nb_streams - 1] < 0) return -1; if (as->streams[as->nb_streams - 1] < 0) return -1;
if (*q == '\0') break; if (*q == '\0') break;