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

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-16 08:24:56 +0000 (Wed, 16 Nov 2005)
New Revision: 324

Added:
   trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.1-00list
Log:
Debian release octave2.1_2.1.72-2

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-15 02:44:53 UTC (rev 323)
+++ trunk/packages/octave/debian/changelog	2005-11-16 08:24:56 UTC (rev 324)
@@ -1,3 +1,13 @@
+octave2.1 (2.1.72-2) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/patches/50_octave-value-list-resize-2.1.dpatch: Added patch
+    posted by J. W. Eaton in the help-octave mailing list for avoiding
+    crashes in the octave_value_list destructor
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Tue, 15 Nov 2005 22:16:18 +0100
+
 octave2.9 (2.9.4-1) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2005-11-15 02:44:53 UTC (rev 323)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2005-11-16 08:24:56 UTC (rev 324)
@@ -1 +1,2 @@
 50_inferior-octave-resync-dirs
+50_octave-value-list-resize-2.1

Added: trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch	2005-11-15 02:44:53 UTC (rev 323)
+++ trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch	2005-11-16 08:24:56 UTC (rev 324)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_octave-value-list-resize-2.1.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid crashes in the octave_value_list destructor.  This patch was
+## DP: posted by J. W. Eaton in the help-octave mailing list.
+## DP: See http://www.octave.org/mailing-lists/help-octave/2005/4266
+## DP: (this patch only applies to octave2.1)
+
+ at DPATCH@
+
+--- octave2.1-2.1.72.orig/src/oct-obj.h
++++ octave2.1-2.1.72/src/oct-obj.h
+@@ -100,7 +100,20 @@
+ 
+   void resize (int n) { data.resize (n); }
+ 
+-  void resize (int n, const octave_value& val);
++  void octave_value_list::resize (int n, const octave_value& val)
++  {
++    int len = length ();
++    
++    if (n > len)
++      {
++        data.resize (n);
++        
++        for (int i = len; i < n; i++)
++          data[i] = val;
++      }
++    else if (n < len)
++      data.resize (n);
++  }
+ 
+   octave_value_list& prepend (const octave_value& val);
+ 
+--- octave2.1-2.1.72.orig/src/oct-obj.cc
++++ octave2.1-2.1.72/src/oct-obj.cc
+@@ -47,22 +47,6 @@
+   return true;
+ }
+ 
+-void
+-octave_value_list::resize (int n, const octave_value& val)
+-{
+-  int len = length ();
+-
+-  if (n > len)
+-    {
+-      data.resize (n);
+-
+-      for (int i = len; i < n; i++)
+-	data[i] = val;
+-    }
+-  else if (n < len)
+-    data.resize (n);
+-}
+-
+ octave_value_list&
+ octave_value_list::prepend (const octave_value& val)
+ {


Property changes on: trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch
___________________________________________________________________
Name: svn:executable
   + *