[FFmpeg-cvslog] oggparsevorbis: fail on memory allocation error

Vittorio Giovara git at videolan.org
Sun Oct 13 10:11:35 CEST 2013


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sat Oct 12 15:37:56 2013 +0200| [fd2384f02b905a106fba9222ece4ddbe2ec61937] | committer: Anton Khirnov

oggparsevorbis: fail on memory allocation error

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

 libavformat/oggparsevorbis.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 7468e0d..c19b545 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -120,9 +120,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
             if (!tt || !ct) {
                 av_freep(&tt);
                 av_freep(&ct);
-                av_log(as, AV_LOG_WARNING,
-                       "out-of-memory error. skipping VorbisComment tag.\n");
-                continue;
+                return AVERROR(ENOMEM);
             }
 
             for (j = 0; j < tl; j++)



More information about the ffmpeg-cvslog mailing list