[mupen64plus] 99/262: Don't segfault when caching 7z archive with subfolders

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 2a0795a712da3a87e8a69aab3dff8fc7ae21058f
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Aug 26 23:51:23 2009 +0200

    Don't segfault when caching 7z archive with subfolders
---
 debian/changelog                          |  2 ++
 debian/patches/115-fix-7z-subfolder.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43b8fae..695ffda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
   * debian/patches
     - Add 114-system-liblzma.patch, use liblzma from debian instead of buildin
       (Closes: #543552)
+    - Add 115-fix-7z-subfolder.patch, fix crash in romcache when reading 7zip
+      archive with subfolders
   * debian/control:
     - Depend on liblzma-dev and pkg-config for lzma and xz support
   * Add README.source with informations about patch management
diff --git a/debian/patches/115-fix-7z-subfolder.patch b/debian/patches/115-fix-7z-subfolder.patch
new file mode 100644
index 0000000..963858f
--- /dev/null
+++ b/debian/patches/115-fix-7z-subfolder.patch
@@ -0,0 +1,27 @@
+From 9cd178b17fa2b552f68c16e71a5d513bd3f05bd3 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Wed, 26 Aug 2009 23:48:26 +0200
+Subject: [PATCH] Don't segfault when caching 7z archive with subfolders
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ main/rom.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/main/rom.c b/main/rom.c
+index 9f69740..0f2e95f 100644
+--- a/main/rom.c
++++ b/main/rom.c
+@@ -411,6 +411,8 @@ unsigned char* load_archive_rom(const char* filename, int* romsize, unsigned cha
+                        printf("7zip Error# %d\n", status);
+                     break; 
+                     }
++                if (outSizeProcessed < 4)
++                    break;
+                 if(is_valid_rom(*outBuffer+offset))
+                     {
+                     *romsize=f->Size;
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 20b0e2f..b440dad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 112-rice-screenflickering.patch
 113-static-binutils-libs.patch
 114-system-liblzma.patch
+115-fix-7z-subfolder.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git