[SM-Commit] GIT changes to master grimoire by George Sherwood (5a6d754808a00040a473e34983943ef5c1873d46)

George Sherwood scm at mail.sourcemage.org
Thu Mar 22 06:35:12 EDT 2007


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 libs/readline/DETAILS        |    2 -
 libs/readline/HISTORY        |    5 ++++
 libs/readline/PRE_BUILD      |    1 
 libs/readline/readline52-002 |   49 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

New commits:
commit 5a6d754808a00040a473e34983943ef5c1873d46
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    readline: Added upstream patch readline52-002. PATCHLEVEL++

diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index 0d26d47..bb427e5 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
       LICENSE[0]=GPL
         WEB_SITE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
          ENTERED=20010922
-      PATCHLEVEL=1
+      PATCHLEVEL=2
         KEYWORDS="libs"
            SHORT="readline lets users edit command lines as they are typed in."
 cat << EOF
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index ae1e5dc..da4298d 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,8 @@
+2007-03-22 George Sherwood <george at beernabeer.com>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Added patch realine52-002
+	* readline52-002: Added upstream patch
+
 2006-12-31 George Sherwood <george at beernabeer.com>
 	* DETAILS: PATCHLEVEL++
 	* PRE_BUILD: added patch readline52-001
diff --git a/libs/readline/PRE_BUILD b/libs/readline/PRE_BUILD
index c1f6c2c..ef3bcf7 100755
--- a/libs/readline/PRE_BUILD
+++ b/libs/readline/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 
 patch -p0 < $SCRIPT_DIRECTORY/readline52-001 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-002 &&
 
 # Dynamically link against termcap or ncurses
 sedit  "s/SHLIB_LIBS =/SHLIB_LIBS = @TERMCAP_LIB@/"  shlib/Makefile.in
diff --git a/libs/readline/readline52-002 b/libs/readline/readline52-002
new file mode 100644
index 0000000..b0d8c92
--- /dev/null
+++ b/libs/readline/readline52-002
@@ -0,0 +1,49 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-002
+
+Bug-Reported-by: Magnus Svensson <msvensson at mysql.com>
+Bug-Reference-ID: <45BDC44D.80609 at mysql.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html
+
+Bug-Description:
+
+Readline neglects to reallocate the array it uses to keep track of wrapped
+screen lines when increasing its size.  This will eventually result in
+segmentation faults when given sufficiently long input.
+
+Patch:
+
+*** ../readline-5.2-patched/display.c	Thu Sep 14 14:20:12 2006
+--- display.c	Fri Feb  2 20:23:17 2007
+***************
+*** 561,574 ****
+--- 561,586 ----
+        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 /* HANDLE_MULTIBYTE */
+  
+  #if defined (HANDLE_MULTIBYTE)	  
+  #define CHECK_LPOS() \



More information about the SM-Commit mailing list