[Python-modules-commits] r8669 - in packages/pyvorbis/trunk/debian (3 files)

[dktrkranz-guest at users.alioth.debian.org]

    Date: Monday, June 1, 2009 @ 13:14:22
  Author: dktrkranz-guest
Revision: 8669

Fix a redundant double free which caused a crash while opening a file (Closes: #521559, #526651)

Added:
  packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch
Modified:
  packages/pyvorbis/trunk/debian/changelog
  packages/pyvorbis/trunk/debian/patches/00list

Modified: packages/pyvorbis/trunk/debian/changelog
===================================================================
--- packages/pyvorbis/trunk/debian/changelog	2009-06-01 12:36:59 UTC (rev 8668)
+++ packages/pyvorbis/trunk/debian/changelog	2009-06-01 13:14:22 UTC (rev 8669)
@@ -1,10 +1,16 @@
-pyvorbis (1.4-2) UNRELEASED; urgency=low
+pyvorbis (1.4-2) UNRELEASED; urgency=high
 
+  [ Sandro Tosi ]
   * debian/control
     - adjust section to 'debug' for -dbg package
 
- -- Sandro Tosi <morph at debian.org>  Fri, 27 Mar 2009 14:20:52 +0100
+  [ Luca Falavigna ]
+  * Urgency high to fix RC bugs.
+  * debian/patches/03_double_free_fix: fix a redundant double free which
+    caused a crash while opening a file (Closes: #521559, #526651).
 
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Mon, 01 Jun 2009 15:10:46 +0200
+
 pyvorbis (1.4-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pyvorbis/trunk/debian/patches/00list
===================================================================
--- packages/pyvorbis/trunk/debian/patches/00list	2009-06-01 12:36:59 UTC (rev 8668)
+++ packages/pyvorbis/trunk/debian/patches/00list	2009-06-01 13:14:22 UTC (rev 8669)
@@ -1,2 +1,3 @@
 01_previous_changes
 02_whrandom_gone
+03_double_free_fix

Added: packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch
===================================================================
--- packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch	                        (rev 0)
+++ packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch	2009-06-01 13:14:22 UTC (rev 8669)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_double_free_fix.dpatch by Luca Falavigna <dktrkranz at ubuntu.com>
+## DP: Fix redundant double free.
+
+ at DPATCH@
+diff -urNad pyvorbis-1.4~/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
+--- pyvorbis-1.4~/src/pyvorbisfile.c	2009-06-01 13:00:44.000000000 +0000
++++ pyvorbis-1.4/src/pyvorbisfile.c	2009-06-01 13:02:40.000000000 +0000
+@@ -173,8 +173,7 @@
+   if (ret == NULL) {
+     PyObject_Del(newobj);
+     return NULL;
+-  } else
+-    Py_DECREF(ret);
++  }
+ 
+   return (PyObject *) newobj;
+ }
+@@ -190,11 +189,9 @@
+     /* If file was opened from a file object, decref it, so it can
+        close */
+     Py_DECREF(py_self->py_file);
+-  } else {
+-    /* Otherwise, we opened the file and should close it. */
+-    fclose(py_self->c_file);
+   }
+ 
++  free(py_self->ovf);
+   PyObject_Del(self);
+ }
+