[SCM] Paraview packaging branch, master, updated. debian/3.14.1-7-3-ga807bc9

Anton Gladky gladky.anton at gmail.com
Thu Oct 25 19:46:13 UTC 2012


The following commit has been merged in the master branch:
commit 6c9958ba666a1966690d2afb595bf864d18eb5d9
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Oct 25 21:44:30 2012 +0200

    Fix STL ascii reader crash.

diff --git a/debian/patches/fix_STL_reader.patch b/debian/patches/fix_STL_reader.patch
new file mode 100644
index 0000000..2f3ac3c
--- /dev/null
+++ b/debian/patches/fix_STL_reader.patch
@@ -0,0 +1,30 @@
+Description: STL ascii reader was report failures prematurely.
+Author: Utkarsh Ayachit <utkarsh.ayachit at kitware.com>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Bug: http://paraview.org/Bug/view.php?id=13101
+Applied-Upstream: http://review.source.kitware.com/#/c/5242/1/IO/vtkSTLReader.cxx
+Last-Update: 2012-10-25
+
+--- a/VTK/IO/vtkSTLReader.cxx
++++ b/VTK/IO/vtkSTLReader.cxx
+@@ -442,12 +442,15 @@
+         {
+         if (!fgets(line, 255, fp))
+           {
+-          vtkErrorMacro ("STLReader error reading file: " << this->FileName
+-                         << " Premature EOF while reading end solid.");
+-          fclose(fp);
+-          return 0;
++          done = feof(fp);
++          if (!done)
++            {
++            vtkErrorMacro ("STLReader error reading file: " << this->FileName
++              << " Premature EOF while reading end solid.");
++            fclose(fp);
++            return 0;
++            }
+           }
+-
+         done = feof(fp);
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a8fd05c..646fe61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+mpi-include.patch
 removegitcheck.patch
 fix_manpages_errors.patch
 paraview-fix-libav07-compat.patch
@@ -7,6 +8,4 @@ install_htmldoc.patch
 kwprocessxml_rpath.patch
 fix_format_not_a_string_FTBFS.patch
 workaround_strict-aliasing_in_mpi4py_MPI.patch
-fix_FTBFS_boost149.patch
-fix_FTBFS_gcc-4.7.patch
-install_all_cmake_files.patch
+fix_STL_reader.patch

-- 
Paraview packaging



More information about the debian-science-commits mailing list