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

avio: Check for memory allocation failure of private data

Browse Source 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2013-10-22 20:22:13 +01:00
parent 327c439f81
commit 25c7db7cc9
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/avio.c
View File

@ -135,6 +135,10 @@ static int url_alloc_for_protocol(URLContext **puc, struct URLProtocol *up,
uc->max_packet_size = 0; /* default: stream file */ uc->max_packet_size = 0; /* default: stream file */
if (up->priv_data_size) { if (up->priv_data_size) {
uc->priv_data = av_mallocz(up->priv_data_size); uc->priv_data = av_mallocz(up->priv_data_size);
if (!uc->priv_data) {
err = AVERROR(ENOMEM);
goto fail;
}
if (up->priv_data_class) { if (up->priv_data_class) {
*(const AVClass **)uc->priv_data = up->priv_data_class; *(const AVClass **)uc->priv_data = up->priv_data_class;
av_opt_set_defaults(uc->priv_data); av_opt_set_defaults(uc->priv_data);
@ -147,6 +151,9 @@ static int url_alloc_for_protocol(URLContext **puc, struct URLProtocol *up,
return 0; return 0;
fail: fail:
*puc = NULL; *puc = NULL;
if (uc)
av_freep(&uc->priv_data);
av_freep(&uc);
#if CONFIG_NETWORK #if CONFIG_NETWORK
if (up->flags & URL_PROTOCOL_FLAG_NETWORK) if (up->flags & URL_PROTOCOL_FLAG_NETWORK)
ff_network_close(); ff_network_close();