[Pkg-octave-commit] rev 788 - in trunk/packages/octave/debian: . in patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-10-25 04:19:56 +0000 (Wed, 25 Oct 2006)
New Revision: 788

Added:
   trunk/packages/octave/debian/patches/50_empty-lhs-sparse.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Debian release octave2.9_2.9.9-4

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-10-24 10:32:28 UTC (rev 787)
+++ trunk/packages/octave/debian/changelog	2006-10-25 04:19:56 UTC (rev 788)
@@ -1,3 +1,11 @@
+octave2.9 (2.9.9-4) unstable; urgency=low
+
+  * debian/patches/50_empty-lhs-sparse.dpatch: Added patch to avoid
+    crashes when calling sparse function with an unitialized LHS
+    (closes: #394982).  Thanks to David Bateman.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 25 Oct 2006 01:30:56 +0200
+
 octave2.9 (2.9.9-3) unstable; urgency=low
 
   * Rebuilt to get the last changes regarding the renaming of otags

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2006-10-24 10:32:28 UTC (rev 787)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2006-10-25 04:19:56 UTC (rev 788)
@@ -3,3 +3,4 @@
 50_mkoctifle-man-indent-option
 50_fix_hold_state.dpatch
 50_rename-octave-tags
+50_empty-lhs-sparse

Added: trunk/packages/octave/debian/patches/50_empty-lhs-sparse.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_empty-lhs-sparse.dpatch	                        (rev 0)
+++ trunk/packages/octave/debian/patches/50_empty-lhs-sparse.dpatch	2006-10-25 04:19:56 UTC (rev 788)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_empty-lhs-sparse.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Resize the lhs at the point we know the assignment can succeed if the
+## DP: lhs is empty.  Patch posted in octave-maintainers at octave.org by
+## DP: David Bateman.
+
+ at DPATCH@
+
+--- octave2.9-2.9.9.orig/liboctave/Sparse.cc
++++ octave2.9-2.9.9/liboctave/Sparse.cc
+@@ -2471,6 +2471,11 @@
+ 
+ 		      Sparse<LT> stmp (new_nr, new_nc, new_nzmx);
+ 
++		      // Started with an empty matrix. Now that we know
++		      // the assignment will succeed, resize lhs 
++		      if (lhs_nr <= 0 || lhs_nc <= 0)
++			lhs = Sparse<RT>(n, m);
++
+ 		      octave_idx_type jji = 0;
+ 		      octave_idx_type jj = idx_j.elem (jji);
+ 		      octave_idx_type kk = 0;
+@@ -2623,6 +2628,11 @@
+ 
+ 		      Sparse<LT> stmp (new_nr, new_nc, new_nzmx);
+ 
++		      // Started with an empty matrix. Now that we know
++		      // the assignment will succeed, resize lhs 
++		      if (lhs_nr <= 0 || lhs_nc <= 0)
++			lhs = Sparse<RT>(n, m);
++
+ 		      octave_idx_type jji = 0;
+ 		      octave_idx_type jj = idx_j.elem (jji);
+ 		      octave_idx_type kk = 0;


Property changes on: trunk/packages/octave/debian/patches/50_empty-lhs-sparse.dpatch
___________________________________________________________________
Name: svn:executable
   + *