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

nsvdec: Propagate errors

Browse Source 
Related to CVE-2011-3940.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit c898431ca5ef2a997fe9388b650f658fb60783e5)

Conflicts:

	libavformat/nsvdec.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 0100c4b1b0736e0f5b3c98f9b0ab8acbef574888)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Alex Converse 2012-01-26 17:23:09 -08:00 committed by Reinhard Tartler
parent 87007519c8
commit 3253dd2b42
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/nsvdec.c
View File

@ -536,11 +536,16 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap)
for (i = 0; i < NSV_MAX_RESYNC_TRIES; i++) { for (i = 0; i < NSV_MAX_RESYNC_TRIES; i++) {
if (nsv_resync(s) < 0) if (nsv_resync(s) < 0)
return -1; return -1;
if (nsv->state == NSV_FOUND_NSVF) if (nsv->state == NSV_FOUND_NSVF) {
err = nsv_parse_NSVf_header(s, ap); err = nsv_parse_NSVf_header(s, ap);
if (err < 0)
return err;
}
/* we need the first NSVs also... */ /* we need the first NSVs also... */
if (nsv->state == NSV_FOUND_NSVS) { if (nsv->state == NSV_FOUND_NSVS) {
err = nsv_parse_NSVs_header(s, ap); err = nsv_parse_NSVs_header(s, ap);
if (err < 0)
return err;
break; /* we just want the first one */ break; /* we just want the first one */
} }
} }