[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#923902: unblock: therion/5.4.3ds1-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package therion.

This fixes a severity: important bug in a package of priority: extra:

https://bugs.debian.org/923737

The diff is small and clean so I've already uploaded to unstable as
suggested by the freeze policy.  The package has successfully built for
all release architectures, and the autopkgtest is passing.

Debdiff against 5.4.3ds-4 (currently in testing) attached.

unblock therion/5.4.3ds1-5

Cheers,
    Olly
diff -Nru therion-5.4.3ds1/debian/changelog therion-5.4.3ds1/debian/changelog
--- therion-5.4.3ds1/debian/changelog	2019-02-08 09:23:36.000000000 +1300
+++ therion-5.4.3ds1/debian/changelog	2019-03-06 10:41:20.000000000 +1300
@@ -1,3 +1,10 @@
+therion (5.4.3ds1-5) unstable; urgency=medium
+
+  * debian/patches/fix-svg-export-segfault.patch: Fix segmentation fault when
+    producing SVG output.  (Closes: #923737)
+
+ -- Olly Betts <olly@survex.com>  Wed, 06 Mar 2019 10:41:20 +1300
+
 therion (5.4.3ds1-4) unstable; urgency=medium
 
   * debian/tests/therion: Give up trying to compare output images for now -
diff -Nru therion-5.4.3ds1/debian/patches/fix-svg-export-segfault.patch therion-5.4.3ds1/debian/patches/fix-svg-export-segfault.patch
--- therion-5.4.3ds1/debian/patches/fix-svg-export-segfault.patch	1970-01-01 12:00:00.000000000 +1200
+++ therion-5.4.3ds1/debian/patches/fix-svg-export-segfault.patch	2019-03-06 10:41:20.000000000 +1300
@@ -0,0 +1,31 @@
+Subject: [PATCH] fix segfault while generating SVG
+ std::map::erase(ITOR) invalidates ITOR, but returns an iterator pointing after
+ the removed element (either to the next element or an end iterator if that was
+ the last element).
+Origin: upstream
+Author: mbudaj <m.budaj@gmail.com>
+Last-Update: 2019-03-06
+
+---
+ thepsparse.cxx | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/thepsparse.cxx b/thepsparse.cxx
+index cf574cf..087886b 100644
+--- a/thepsparse.cxx
++++ b/thepsparse.cxx
+@@ -386,9 +386,11 @@ void MP_data::print_svg (ofstream & F, string unique_prefix) {
+             }
+             // nemoze ist do predch. cyklu, lebo zmazanie smernika
+             // urobi chaos
+-            for (map<int,int>::iterator I = gstate.clippathdepth.begin();
+-                                        I!= gstate.clippathdepth.end(); I++) {
+-              if (I->second < 0) gstate.clippathdepth.erase(I);
++            {auto I = gstate.clippathdepth.begin();
++              while (I!= gstate.clippathdepth.end()) {
++                if (I->second < 0) I = gstate.clippathdepth.erase(I);
++                else I++;
++              }
+             }
+             tmpclip = gstate.clippathdepth;
+             gstate = GSTATE_stack.back();
diff -Nru therion-5.4.3ds1/debian/patches/series therion-5.4.3ds1/debian/patches/series
--- therion-5.4.3ds1/debian/patches/series	2019-01-09 09:14:45.000000000 +1300
+++ therion-5.4.3ds1/debian/patches/series	2019-03-06 10:41:20.000000000 +1300
@@ -1,3 +1,4 @@
 10doc-fixes.patch
 80debianise-makefiles.patch
 90debianise-loch-makefile.patch
+fix-svg-export-segfault.patch

Attachment: signature.asc
Description: PGP signature


Reply to: