[Python-modules-commits] r31376 - in packages/python-levenshtein/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Monday, November 3, 2014 @ 20:42:41
  Author: morph
Revision: 31376

* debian/patches/6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch
  - fix a crash when using seq*() functions; thanks to Emil Langrock for the
    report; Closes: #597609

Added:
  packages/python-levenshtein/trunk/debian/patches/6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch
Modified:
  packages/python-levenshtein/trunk/debian/changelog
  packages/python-levenshtein/trunk/debian/patches/series

Modified: packages/python-levenshtein/trunk/debian/changelog
===================================================================
--- packages/python-levenshtein/trunk/debian/changelog	2014-11-03 18:34:38 UTC (rev 31375)
+++ packages/python-levenshtein/trunk/debian/changelog	2014-11-03 20:42:41 UTC (rev 31376)
@@ -1,3 +1,11 @@
+python-levenshtein (0.11.2-2) UNRELEASED; urgency=medium
+
+  * debian/patches/6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch
+    - fix a crash when using seq*() functions; thanks to Emil Langrock for the
+      report; Closes: #597609
+
+ -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2014 20:39:31 +0000
+
 python-levenshtein (0.11.2-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Added: packages/python-levenshtein/trunk/debian/patches/6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch
===================================================================
--- packages/python-levenshtein/trunk/debian/patches/6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch	                        (rev 0)
+++ packages/python-levenshtein/trunk/debian/patches/6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch	2014-11-03 20:42:41 UTC (rev 31376)
@@ -0,0 +1,41 @@
+From 6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54 Mon Sep 17 00:00:00 2001
+From: Antti Haapala <antti.haapala at anttipatterns.com>
+Date: Tue, 23 Sep 2014 13:50:16 +0300
+Subject: [PATCH] Use the created Fast Sequence instead of assuming one can use
+ the original sequence unmodified.
+
+---
+ Levenshtein.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Levenshtein.c b/Levenshtein.c
+index 12554ec..bf0e7fa 100644
+--- a/Levenshtein.c
++++ b/Levenshtein.c
+@@ -1302,8 +1302,8 @@ setseq_common(PyObject *args, const char *name, SetSeqFuncs foo,
+   strseq1 = PySequence_Fast(strlist1, name);
+   strseq2 = PySequence_Fast(strlist2, name);
+ 
+-  n1 = PySequence_Fast_GET_SIZE(strlist1);
+-  n2 = PySequence_Fast_GET_SIZE(strlist2);
++  n1 = PySequence_Fast_GET_SIZE(strseq1);
++  n2 = PySequence_Fast_GET_SIZE(strseq2);
+   *lensum = n1 + n2;
+   if (n1 == 0) {
+     Py_DECREF(strseq1);
+@@ -1316,13 +1316,13 @@ setseq_common(PyObject *args, const char *name, SetSeqFuncs foo,
+     return (double)n1;
+   }
+ 
+-  stringtype1 = extract_stringlist(strlist1, name, n1, &sizes1, &strings1);
++  stringtype1 = extract_stringlist(strseq1, name, n1, &sizes1, &strings1);
+   Py_DECREF(strseq1);
+   if (stringtype1 < 0) {
+     Py_DECREF(strseq2);
+     return r;
+   }
+-  stringtype2 = extract_stringlist(strlist2, name, n2, &sizes2, &strings2);
++  stringtype2 = extract_stringlist(strseq2, name, n2, &sizes2, &strings2);
+   Py_DECREF(strseq2);
+   if (stringtype2 < 0) {
+     free(sizes1);

Modified: packages/python-levenshtein/trunk/debian/patches/series
===================================================================
--- packages/python-levenshtein/trunk/debian/patches/series	2014-11-03 18:34:38 UTC (rev 31375)
+++ packages/python-levenshtein/trunk/debian/patches/series	2014-11-03 20:42:41 UTC (rev 31376)
@@ -1 +1,2 @@
 add_missing_genextdoc.py.patch
+6c654dad56edf9ba4e38b5ab5f5dd6fcf5fffa54.patch