[libav-commits] nsvdec: Propagate errors

Alex Converse git at libav.org
Mon Jan 30 19:24:28 CET 2012


Module: libav
Branch: master
Commit: c898431ca5ef2a997fe9388b650f658fb60783e5

Author:    Alex Converse <alex.converse at gmail.com>
Committer: Alex Converse <alex.converse at gmail.com>
Date:      Thu Jan 26 17:23:09 2012 -0800

nsvdec: Propagate errors

Related to CVE-2011-3940.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

---

 libavformat/nsvdec.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 7e32e43..2ad8cb3 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -532,11 +532,16 @@ static int nsv_read_header(AVFormatContext *s)
     for (i = 0; i < NSV_MAX_RESYNC_TRIES; i++) {
         if (nsv_resync(s) < 0)
             return -1;
-        if (nsv->state == NSV_FOUND_NSVF)
+        if (nsv->state == NSV_FOUND_NSVF) {
             err = nsv_parse_NSVf_header(s);
+            if (err < 0)
+                return err;
+        }
             /* we need the first NSVs also... */
         if (nsv->state == NSV_FOUND_NSVS) {
             err = nsv_parse_NSVs_header(s);
+            if (err < 0)
+                return err;
             break; /* we just want the first one */
         }
     }



More information about the libav-commits mailing list