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

lavu/opt: make sure av_opt_set_bin() handles NULL/0.

Browse Source
This commit is contained in:
Nicolas George
2013-03-28 16:45:12 +01:00
parent 9dd54d7422
commit 983d04dd40
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/opt.c
View File

@@ -420,8 +420,8 @@ int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int
if (o->type != AV_OPT_TYPE_BINARY) if (o->type != AV_OPT_TYPE_BINARY)
return AVERROR(EINVAL); return AVERROR(EINVAL);
ptr = av_malloc(len); ptr = len ? av_malloc(len) : NULL;
if (!ptr) if (len && !ptr)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset); dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
@@ -430,7 +430,8 @@ int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int
av_free(*dst); av_free(*dst);
*dst = ptr; *dst = ptr;
*lendst = len; *lendst = len;
memcpy(ptr, val, len); if (len)
memcpy(ptr, val, len);
return 0; return 0;
} }