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

Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'

Browse Source 
* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-06 21:37:33 +01:00
parent dede2f7fc4 07a0c0f000
commit b20e79dbe9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/opt.c
View File

@@ -143,6 +143,8 @@ static int set_string_binary(void *obj, const AVOption *o, const char *val, uint
len /= 2; len /= 2;
ptr = bin = av_malloc(len); ptr = bin = av_malloc(len);
if (!ptr)
return AVERROR(ENOMEM);
while (*val) { while (*val) {
int a = hexchar2int(*val++); int a = hexchar2int(*val++);
int b = hexchar2int(*val++); int b = hexchar2int(*val++);