[Python-modules-commits] r18186 - in packages/pyvorbis/trunk/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, August 17, 2011 @ 09:10:41
  Author: morph
Revision: 18186

* debian/patches/03_double_free_fix.dpatch
  - removed, merged upstream

Modified:
  packages/pyvorbis/trunk/debian/changelog
Deleted:
  packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch

Modified: packages/pyvorbis/trunk/debian/changelog
===================================================================
--- packages/pyvorbis/trunk/debian/changelog	2011-08-17 09:04:07 UTC (rev 18185)
+++ packages/pyvorbis/trunk/debian/changelog	2011-08-17 09:10:41 UTC (rev 18186)
@@ -5,8 +5,10 @@
       report; Closes: #627144
   * debian/patches/01_previous_changes.dpatch
     - adapted to new upstream code
+  * debian/patches/03_double_free_fix.dpatch
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Wed, 17 Aug 2011 11:02:52 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 17 Aug 2011 11:09:02 +0200
 
 pyvorbis (1.4-2) unstable; urgency=medium
 

Deleted: packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch
===================================================================
--- packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch	2011-08-17 09:04:07 UTC (rev 18185)
+++ packages/pyvorbis/trunk/debian/patches/03_double_free_fix.dpatch	2011-08-17 09:10:41 UTC (rev 18186)
@@ -1,31 +0,0 @@
-#! /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);
- }
-