[med-svn] r5076 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2010-07-30 12:57:35 +0000 (Fri, 30 Jul 2010)
New Revision: 5076

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Avoid memory leak in itkNiftiImageIO.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-07-30 12:54:24 UTC (rev 5075)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-07-30 12:57:35 UTC (rev 5076)
@@ -6,8 +6,11 @@
   * CMakeCache.txt.debian: Remove.
   * rules: Move contents of CMakeCache.txt.debian into rules as "-D"
     options to cmake.
+  
+  * patches/nifti-memleak.patch: New.  Fix memory leak in itkNiftiImageIO.
+    Closes: #587200.
 
- -- Steve M. Robbins <smr at debian.org>  Fri, 30 Jul 2010 06:42:26 -0500
+ -- Steve M. Robbins <smr at debian.org>  Fri, 30 Jul 2010 07:57:11 -0500
 
 insighttoolkit (3.18.0-3) unstable; urgency=low
 

Added: trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/nifti-memleak.patch	2010-07-30 12:57:35 UTC (rev 5076)
@@ -0,0 +1,31 @@
+Description: Avoid memory leak.  Patch taken from upstream CVS.
+Author: Yaroslav Halchenko <debian at onerussian.com>
+Bug: 587200
+Forwarded: http://public.kitware.com/Bug/view.php?id=10899
+
+--- insighttoolkit-3.18.0.orig/Code/IO/itkNiftiImageIO.cxx
++++ insighttoolkit-3.18.0/Code/IO/itkNiftiImageIO.cxx
+@@ -3,8 +3,8 @@
+   Program:   Insight Segmentation & Registration Toolkit
+   Module:    $RCSfile: itkNiftiImageIO.cxx,v $
+   Language:  C++
+-  Date:      $Date: 2009-11-22 13:33:11 $
+-  Version:   $Revision: 1.87 $
++  Date:      $Date: 2010-07-12 16:02:48 $
++  Version:   $Revision: 1.88 $
+ 
+   Copyright (c) Insight Software Consortium. All rights reserved.
+   See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
+@@ -456,7 +456,11 @@
+     // sizes = x y z t vecsize
+     _size[4] = numComponents;
+     }
+-
++  // Free memory if any was occupied already (incase of re-using the IO filter).
++  if (this->m_NiftiImage != NULL)
++    {
++      nifti_image_free(this->m_NiftiImage);
++    }
+   //
+   // allocate nifti image...
+   this->m_NiftiImage = nifti_image_read(this->GetFileName(),false);

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-07-30 12:54:24 UTC (rev 5075)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-07-30 12:57:35 UTC (rev 5076)
@@ -5,3 +5,4 @@
 itkTkImageViewer2D.patch
 jni-dir.patch
 remove-cmake-export-build-settings.patch
+nifti-memleak.patch