[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-2-8-g025e592

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit c00cfcca42e2d9587ef798de78af4d841b6196fe
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Apr 3 00:10:36 2012 +0200

    Fix an incorrect memset invocation.

diff --git a/debian/changelog b/debian/changelog
index de25803..702d803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mednafen (0.9.21-1) experimental; urgency=low
     gzip-1.2.6-fix.patch and shader-fix.patch (applied upstream).
   * Add use-system-mpcdec.patch to build using the Debian-provided
     libmpcdec rather than the bundled version.
+  * Add cdrom-if-memset-fix.patch to fix an incorrect memset invocation
+    (spotted by gcc).
 
  -- Stephen Kitt <steve at sk2.org>  Tue, 03 Apr 2012 00:05:58 +0200
 
diff --git a/debian/patches/cdromif-memset-fix.patch b/debian/patches/cdromif-memset-fix.patch
new file mode 100644
index 0000000..39b63f9
--- /dev/null
+++ b/debian/patches/cdromif-memset-fix.patch
@@ -0,0 +1,17 @@
+Subject: Fix memset invocation
+Author: Stephen Kitt <steve at sk2.org>
+Forwarded: yes, http://forum.fobby.net/index.php?t=msg&goto=2458&#msg_2458
+
+This memset call has its last two arguments swapped.
+
+--- mednafen.orig/src/cdrom/cdromif.cpp
++++ mednafen/src/cdrom/cdromif.cpp
+@@ -344,7 +344,7 @@
+ 
+  if(UnrecoverableError)
+  {
+-  memset(buf, 2352 + 96, 0);
++  memset(buf, 0, 2352 + 96);
+   return(false);
+  }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f06589d..71fa0f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-system-tremor.patch
 use-system-mpcdec.patch
 hardening-fixes.patch
+cdromif-memset-fix.patch

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine