[FFmpeg-cvslog] avformat/mov: set correct error code in mov_read_custom

Pan Bian git at videolan.org
Tue Nov 28 22:44:31 EET 2017


ffmpeg | branch: master | Pan Bian <bianpan2016 at 163.com> | Mon Nov 27 11:12:56 2017 +0800| [3f81259f337ba57ab1a722566c8d8122dc705823] | committer: Michael Niedermayer

avformat/mov: set correct error code in mov_read_custom

In function mov_read_custom(), it returns 0 on the path that av_malloc()
returns a NULL pointer. 0 indicates success. An error code should be
assigned to ret.

Signed-off-by: Pan Bian <bianpan2016 at 163.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/mov.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index b3b800f898..230a7f95d0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4176,8 +4176,10 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             break;
 
         *p = av_malloc(len + 1);
-        if (!*p)
+        if (!*p) {
+            ret = AVERROR(ENOMEM);
             break;
+        }
         ret = ffio_read_size(pb, *p, len);
         if (ret < 0) {
             av_freep(p);



More information about the ffmpeg-cvslog mailing list