generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavd/lavfi: fix leak in case of failure

Browse Source 
Jump to the common release code in case of failure.
This commit is contained in:
Stefano Sabatini 2012-10-25 21:33:45 +02:00
parent 48ec8b25a7
commit b19bfd6c9f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavdevice/lavfi.c
View File

@ -109,7 +109,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
if (lavfi->graph_filename && lavfi->graph_str) { if (lavfi->graph_filename && lavfi->graph_str) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Only one of the graph or graph_file options must be specified\n"); "Only one of the graph or graph_file options must be specified\n");
return AVERROR(EINVAL); FAIL(AVERROR(EINVAL));
} }
if (lavfi->graph_filename) { if (lavfi->graph_filename) {
@ -118,13 +118,13 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
ret = av_file_map(lavfi->graph_filename, ret = av_file_map(lavfi->graph_filename,
&file_buf, &file_bufsize, 0, avctx); &file_buf, &file_bufsize, 0, avctx);
if (ret < 0) if (ret < 0)
return ret; goto end;
/* create a 0-terminated string based on the read file */ /* create a 0-terminated string based on the read file */
graph_buf = av_malloc(file_bufsize + 1); graph_buf = av_malloc(file_bufsize + 1);
if (!graph_buf) { if (!graph_buf) {
av_file_unmap(file_buf, file_bufsize); av_file_unmap(file_buf, file_bufsize);
return AVERROR(ENOMEM); FAIL(AVERROR(ENOMEM));
} }
memcpy(graph_buf, file_buf, file_bufsize); memcpy(graph_buf, file_buf, file_bufsize);
graph_buf[file_bufsize] = 0; graph_buf[file_bufsize] = 0;