From: Michael Niedermayer <michael@niedermayer.cc>
Date: Tue, 3 Jul 2018 20:14:42 +0000 (+0200)
Subject: avformat/pva: Check for EOF before retrying in read_part_of_packet()
X-Git-Tag: archive/raspbian/6%11.12-1_deb8u9+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7824516a71ee0b59e7ddda7cdb712a99c545c56f;p=libav.git

avformat/pva: Check for EOF before retrying in read_part_of_packet()

Fixes: Infinite loop
Fixes: pva-4b1835dbc2027bf3c567005dcc78e85199240d06

Found-by: Paul Ch <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Gbp-Pq: Name CVE-2018-1999012.patch
---

diff --git a/libavformat/pva.c b/libavformat/pva.c
index 3abfc18..ea52892 100644
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -120,6 +120,10 @@ recover:
             pes_flags              = avio_rb16(pb);
             pes_header_data_length = avio_r8(pb);
 
+            if (avio_feof(pb)) {
+                return AVERROR_EOF;
+            }
+
             if (pes_signal != 1) {
                 pva_log(s, AV_LOG_WARNING, "expected signaled PES packet, "
                                           "trying to recover\n");