Commit 0edf8a7a authored by Philip Gladstone's avatar Philip Gladstone

* Don't allocate 0 bytes of memory. It upsets electricFence!

Originally committed as revision 472 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8170f3dc
......@@ -71,12 +71,17 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec)
avctx->codec = codec;
avctx->frame_number = 0;
avctx->priv_data = av_mallocz(codec->priv_data_size);
if (!avctx->priv_data)
return -ENOMEM;
if (codec->priv_data_size > 0) {
avctx->priv_data = av_mallocz(codec->priv_data_size);
if (!avctx->priv_data)
return -ENOMEM;
} else {
avctx->priv_data = NULL;
}
ret = avctx->codec->init(avctx);
if (ret < 0) {
free(avctx->priv_data);
if (avctx->priv_data)
free(avctx->priv_data);
avctx->priv_data = NULL;
return ret;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment