[FFmpeg-cvslog] avio: Check for memory allocation failure of private data

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Oct 22 20:22:13 2013 +0100| [25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448] | committer: Derek Buitenhuis

avio: Check for memory allocation failure of private data

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448
---

 libavformat/avio.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index d9e5380..e07b236 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -135,6 +135,10 @@ static int url_alloc_for_protocol(URLContext **puc, struct URLProtocol *up,
     uc->max_packet_size = 0; /* default: stream file */
     if (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) {
             *(const AVClass **)uc->priv_data = up->priv_data_class;
             av_opt_set_defaults(uc->priv_data);
@@ -147,6 +151,9 @@ static int url_alloc_for_protocol(URLContext **puc, struct URLProtocol *up,
     return 0;
 fail:
     *puc = NULL;
+    if (uc)
+        av_freep(&uc->priv_data);
+    av_freep(&uc);
 #if CONFIG_NETWORK
     if (up->flags & URL_PROTOCOL_FLAG_NETWORK)
         ff_network_close();