[med-svn] r18219 - in trunk/packages/minc/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Mon Oct 6 07:48:10 UTC 2014
Author: tille
Date: 2014-10-06 07:48:09 +0000 (Mon, 06 Oct 2014)
New Revision: 18219
Added:
trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch
trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null.patch
Modified:
trunk/packages/minc/trunk/debian/changelog
trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff
trunk/packages/minc/trunk/debian/patches/acrnema-version.patch
trunk/packages/minc/trunk/debian/patches/makefile.patch
trunk/packages/minc/trunk/debian/patches/maxpathlen.patch
trunk/packages/minc/trunk/debian/patches/pod_fix.diff
trunk/packages/minc/trunk/debian/patches/series
Log:
Apply two patches fixing Mahem test issues. Thanks to Martin Stegh?\195?\182fer <martin at steghoefer.eu>
Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/changelog 2014-10-06 07:48:09 UTC (rev 18219)
@@ -1,3 +1,11 @@
+minc (2.2.00-6) UNRELEASED; urgency=medium
+
+ * Apply two patches fixing Mahem test issues. Thanks to Martin
+ Steghöfer <martin at steghoefer.eu>
+ Closes: #716511, #716616
+
+ -- Andreas Tille <tille at debian.org> Mon, 06 Oct 2014 09:49:50 +0200
+
minc (2.2.00-5) unstable; urgency=medium
[ Gilles Filippini ]
Modified: trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff
===================================================================
--- trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff 2014-10-06 07:48:09 UTC (rev 18219)
@@ -1,6 +1,6 @@
---- minc-2.0.15.orig/progs/mincedit/mincedit
-+++ minc-2.0.15/progs/mincedit/mincedit
-@@ -109,7 +109,7 @@
+--- a/progs/mincedit/mincedit
++++ b/progs/mincedit/mincedit
+@@ -113,7 +113,7 @@ case $# in
then
editor=${EDITOR}
else
Modified: trunk/packages/minc/trunk/debian/patches/acrnema-version.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/acrnema-version.patch 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/patches/acrnema-version.patch 2014-10-06 07:48:09 UTC (rev 18219)
@@ -1,6 +1,6 @@
---- minc-2.2.00.orig/Makefile.am
-+++ minc-2.2.00/Makefile.am
-@@ -555,6 +555,7 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -555,6 +555,7 @@ libvolume_io2_la_SOURCES = \
volume_io/Volumes/volume_cache.c \
volume_io/Volumes/volumes.c
Added: trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch (rev 0)
+++ trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch 2014-10-06 07:48:09 UTC (rev 18219)
@@ -0,0 +1,22 @@
+Description: Fix crash when input file cannot be expanded
+ This patch fixes a segmentation fault that occurs when an input
+ file has a filename extension that indicates compression (e.g.
+ ".bz2"), but doesn't really contain content in the corresponding
+ compression format. In this case exit with an error message instead
+ of just crashing.
+Author: Martin Steghöfer <martin at steghoefer.eu>
+Bug-Debian: http://bugs.debian.org/716511
+
+--- a/libsrc/voxel_loop.c
++++ b/libsrc/voxel_loop.c
+@@ -2354,6 +2354,10 @@ PRIVATE int get_input_mincid(Loopfile_In
+ filename = miexpand_file(loopfile_info->input_files[file_num], NULL,
+ loopfile_info->headers_only,
+ &created_tempfile);
++ if (!filename) {
++ fprintf(stderr, "Could not expand file \"%s\"!\n", loopfile_info->input_files[file_num]);
++ exit(EXIT_FAILURE);
++ }
+ loopfile_info->input_mincid[index] = miopen(filename, NC_NOWRITE);
+ if (created_tempfile) {
+ (void) remove(filename);
Added: trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null.patch (rev 0)
+++ trunk/packages/minc/trunk/debian/patches/fix-crash-filename-null.patch 2014-10-06 07:48:09 UTC (rev 18219)
@@ -0,0 +1,22 @@
+Description: Fix crash in mincconcat when header cannot be expanded
+ This patch fixes a segmentation fault that occurs when an input
+ file has a filename extension that indicates compression (e.g.
+ ".bz2"), but doesn't really contain content in the corresponding
+ compression format. In this case exit with an error message instead
+ of just crashing.
+Author: Martin Steghöfer <martin at steghoefer.eu>
+Bug-Debian: http://bugs.debian.org/716616
+
+--- a/progs/mincconcat/mincconcat.c
++++ b/progs/mincconcat/mincconcat.c
+@@ -701,6 +701,10 @@ static void get_concat_dim_name(Concat_I
+
+ /* Expand the file header and open the file */
+ filename = miexpand_file(first_filename, NULL, TRUE, &created_tempfile);
++ if (!filename) {
++ fprintf(stderr, "Could not expand file \"%s\"!\n", first_filename);
++ exit(EXIT_FAILURE);
++ }
+ input_mincid = miopen(filename, NC_NOWRITE);
+ if (created_tempfile) {
+ (void) remove(filename);
Modified: trunk/packages/minc/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/makefile.patch 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/patches/makefile.patch 2014-10-06 07:48:09 UTC (rev 18219)
@@ -1,6 +1,6 @@
---- minc-2.2.00.orig/Makefile.am
-+++ minc-2.2.00/Makefile.am
-@@ -274,30 +274,30 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -274,30 +274,30 @@ m4_files = \
m4/smr_WITH_BUILD_PATH.m4
ezMINC_files = \
Modified: trunk/packages/minc/trunk/debian/patches/maxpathlen.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/maxpathlen.patch 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/patches/maxpathlen.patch 2014-10-06 07:48:09 UTC (rev 18219)
@@ -1,5 +1,5 @@
---- minc-2.2.00.orig/progs/mincmorph/mincmorph.c
-+++ minc-2.2.00/progs/mincmorph/mincmorph.c
+--- a/progs/mincmorph/mincmorph.c
++++ b/progs/mincmorph/mincmorph.c
@@ -30,6 +30,11 @@
#define INTERNAL_PREC NC_FLOAT /* should be NC_FLOAT or NC_DOUBLE */
#define DEF_DOUBLE -DBL_MAX
Modified: trunk/packages/minc/trunk/debian/patches/pod_fix.diff
===================================================================
--- trunk/packages/minc/trunk/debian/patches/pod_fix.diff 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/patches/pod_fix.diff 2014-10-06 07:48:09 UTC (rev 18219)
@@ -7,8 +7,8 @@
Bug-Debian: http://bugs.debian.org/719502
Forwarded: no
---- minc-2.2.00.orig/progs/mincpik/mincpik.in
-+++ minc-2.2.00/progs/mincpik/mincpik.in
+--- a/progs/mincpik/mincpik.in
++++ b/progs/mincpik/mincpik.in
@@ -576,8 +576,11 @@ font point size for the title
create an annotated bar to match the image (use height of the output image)
Modified: trunk/packages/minc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/trunk/debian/patches/series 2014-10-06 07:46:53 UTC (rev 18218)
+++ trunk/packages/minc/trunk/debian/patches/series 2014-10-06 07:48:09 UTC (rev 18219)
@@ -4,3 +4,5 @@
acrnema-version.patch
pod_fix.diff
clang.patch
+fix-crash-filename-null-voxel-loop.patch
+fix-crash-filename-null.patch
More information about the debian-med-commit
mailing list