[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-37-g4ebf6eb

[Thomas Weber]

The following commit has been merged in the master branch:
commit fc6e04d3498fd375949b73195b63f5668dfa6fc2
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 15 08:21:38 2011 +0200

    Avoid implicit conversion, fix for 603046

diff --git a/debian/changelog b/debian/changelog
index 2dea778..cfa00d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ octave3.2 (3.2.4-10) UNRELEASED; urgency=low
     instantiations either (closes: #603046). The latter bug isn't mentioned in
     the bug report, but was seen once the first bug was fixed. Thanks to Orion
     Poplawski from Fedora for the original patch.
+    - avoid-implicit-conversion: explicitly convert strings to numbers
+    (closes: 603046). Thanks to Kim Hansen for the patch.
 
  -- Thomas Weber <tweber at debian.org>  Sun, 15 May 2011 07:51:18 +0200
 
diff --git a/debian/in/series b/debian/in/series
index 8986b63..cc80239 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -20,4 +20,5 @@ handle_new_graphicsmagic
 fix_relative_addpath
 include_mpi_headers
 fixes-for-gcc-4.6
+avoid-implicit-conversion
 :]
diff --git a/debian/patches/avoid-implicit-conversion b/debian/patches/avoid-implicit-conversion
new file mode 100644
index 0000000..5fc4909
--- /dev/null
+++ b/debian/patches/avoid-implicit-conversion
@@ -0,0 +1,20 @@
+From: Kim Hansen <kim at i9.dk>
+Description: Explicitly converts strings to numbers
+Bug: https://savannah.gnu.org/bugs/index.php?32546
+Bug-Debian: http://bugs.debian.org/603046
+Applied-Upstream: http://hg.savannah.gnu.org/hgweb/octave/rev/26d3164fd58d
+--- a/scripts/strings/strchr.m
++++ b/scripts/strings/strchr.m
+@@ -34,10 +34,10 @@
+     print_usage ();
+   endif
+   f = false (1, 256);
+-  f(chars + 1) = true;
++  f(uint8(chars)+1) = true;
+   varargout = cell (1, nargout);
+   varargout{1} = [];
+-  [varargout{:}] = find (reshape (f(str + 1), size (str)), varargin{:});
++  [varargout{:}] = find (reshape (f(uint8(str) + 1), size (str)), varargin{:});
+ endfunction 
+ 
+ %!assert(strchr("Octave is the best software","best"),[3, 6, 9, 11, 13, 15, 16, 17, 18, 20, 23, 27])

-- 
octave