From: Date: January 29 2007 12:24pm
Subject: bk commit into 5.0 tree (msvensson:1.2392) BUG#19474
List-Archive: http://lists.mysql.com/commits/18939
X-Bug: 19474
Message-Id: <200701291124.l0TBOCba015216@pilot>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-29 12:24:08+01:00, msvensson@stripped +1 -0
  Bug#19474 readline bug: mysql: free(): invalid pointer
   - Write to uninitialised memory occured since _rl_rapped_lines buffer
     was not extended in CHECK_INV_LBREAKS macro
   - Patch submitted to bug-readline@stripped

  cmd-line-utils/readline/display.c@stripped, 2007-01-29 12:24:06+01:00, msvensson@stripped +12 -0
    Extend _rl_wrapped_lines everytime inv_lbsize is increased

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/bug19474/my50-bug19474

--- 1.15/cmd-line-utils/readline/display.c	2006-11-20 21:41:36 +01:00
+++ 1.16/cmd-line-utils/readline/display.c	2007-01-29 12:24:06 +01:00
@@ -524,14 +524,26 @@
       wrap_offset = prompt_invis_chars_first_line = 0;
     }
 
+#if defined (HANDLE_MULTIBYTE)	  
 #define CHECK_INV_LBREAKS() \
       do { \
 	if (newlines >= (inv_lbsize - 2)) \
 	  { \
 	    inv_lbsize *= 2; \
 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+            _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
 	  } \
       } while (0)
+#else
+#define CHECK_INV_LBREAKS() \
+      do { \
+	if (newlines >= (inv_lbsize - 2)) \
+	  { \
+	    inv_lbsize *= 2; \
+	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+	  } \
+      } while (0)
+#endif
 
 #if defined (HANDLE_MULTIBYTE)	  
 #define CHECK_LPOS() \