From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 5 Mar 2023 13:11:44 +0000 (-0500)
Subject: fixup CVE-2022-29340.patch
X-Git-Tag: archive/raspbian/2.0.0+dfsg1-4+rpi1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ca1466a131df1ae07758f140c1bcd12e27910ab;p=gpac.git

fixup CVE-2022-29340.patch
---

diff --git a/debian/patches/CVE-2022-29340.patch b/debian/patches/CVE-2022-29340.patch
index 7a3aaa7..7cc1473 100644
--- a/debian/patches/CVE-2022-29340.patch
+++ b/debian/patches/CVE-2022-29340.patch
@@ -8,7 +8,16 @@ Index: gpac/src/isomedia/box_funcs.c
 ===================================================================
 --- gpac.orig/src/isomedia/box_funcs.c
 +++ gpac/src/isomedia/box_funcs.c
-@@ -303,8 +303,10 @@ GF_Err gf_isom_box_parse_ex(GF_Box **out
+@@ -90,6 +90,8 @@ static GF_Err gf_isom_full_box_read(GF_B
+ 
+ u64 unused_bytes = 0;
+ 
++#define GF_SKIP_BOX 10
++
+ GF_Err gf_isom_box_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box)
+ {
+ 	u32 type, uuid_type, hdr_size, restore_type;
+@@ -303,8 +305,10 @@ GF_Err gf_isom_box_parse_ex(GF_Box **out
  	if (e && (e != GF_ISOM_INCOMPLETE_FILE)) {
  		gf_isom_box_del(newBox);
  		*outBox = NULL;