[Pkg-octave-commit] r2177 - in octave-forge-pkgs/octave-miscellaneous/trunk/debian: . patches

[Thomas Weber]

tags 485920 pending
thanks

Author: thomas-guest
Date: 2008-06-23 11:41:32 +0000 (Mon, 23 Jun 2008)
New Revision: 2177

Added:
   octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/waitbar_null_pointer_guard
Modified:
   octave-forge-pkgs/octave-miscellaneous/trunk/debian/changelog
   octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/series
Log:
bugfix for 485920

Modified: octave-forge-pkgs/octave-miscellaneous/trunk/debian/changelog
===================================================================
--- octave-forge-pkgs/octave-miscellaneous/trunk/debian/changelog	2008-06-21 16:45:47 UTC (rev 2176)
+++ octave-forge-pkgs/octave-miscellaneous/trunk/debian/changelog	2008-06-23 11:41:32 UTC (rev 2177)
@@ -1,3 +1,11 @@
+octave-miscellaneous (1.0.6-3) UNRELEASED; urgency=low
+
+  * New patch: 
+    + waitbar_null_pointer_guard: Check that the return values from tgetstr()
+    are non-zero (closes: 485920).
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Mon, 23 Jun 2008 13:34:33 +0200
+
 octave-miscellaneous (1.0.6-2) unstable; urgency=low
 
   * New patches:

Modified: octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/series
===================================================================
--- octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/series	2008-06-21 16:45:47 UTC (rev 2176)
+++ octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/series	2008-06-23 11:41:32 UTC (rev 2177)
@@ -1,3 +1,4 @@
 special_matrix_lauchli
 autoload-num2hex
 build-hex2num
+waitbar_null_pointer_guard

Added: octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/waitbar_null_pointer_guard
===================================================================
--- octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/waitbar_null_pointer_guard	                        (rev 0)
+++ octave-forge-pkgs/octave-miscellaneous/trunk/debian/patches/waitbar_null_pointer_guard	2008-06-23 11:41:32 UTC (rev 2177)
@@ -0,0 +1,27 @@
+Bug fix for #485920
+Applied upstream in SVN rev 5134
+--- a/src/waitbar.cc
++++ b/src/waitbar.cc
+@@ -146,11 +146,18 @@
+ 	  char* buf_ptr	= term_buffer;
+ 	  begin_rv	= tgetstr("so", &buf_ptr);
+ 	  end_rv	= tgetstr("se", &buf_ptr);
+-	  brvlen = 0;	buf_ptr = begin_rv;
+-	  while(buf_ptr[++brvlen]);
+-	  ervlen = 0;	buf_ptr = end_rv;
+-	  while(buf_ptr[++ervlen]);
+ 	  
++	  // Display a progress bar, but only if the current terminal has a
++	  // standout mode
++	  if (begin_rv && end_rv)
++	    {
++	      brvlen = 0;	
++	      buf_ptr = begin_rv;
++	      while(buf_ptr[++brvlen]);
++	      ervlen = 0;	buf_ptr = end_rv;
++	      while(buf_ptr[++ervlen]);
++	    }
++	 	  
+ 	  // initialize print buffer
+ 	  for(i=0; i<BUF_SIZE; ++i)
+ 	    print_buf[i]	= ' ';