Browse Source

Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4

* commit '61335ab33e594d47b84fde7367ee10dc66fc3465':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
commit
ee910aef38
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavutil/opt.c

+ 2
- 0
libavutil/opt.c View File

@@ -150,6 +150,8 @@ static int set_string_binary(void *obj, const AVOption *o, const char *val, uint
len /= 2;

ptr = bin = av_malloc(len);
if (!ptr)
return AVERROR(ENOMEM);
while (*val) {
int a = hexchar2int(*val++);
int b = hexchar2int(*val++);


Loading…
Cancel
Save