Просмотр исходного кода

apply to more segfault fixing patches

Ralf S. Engelschall 21 лет назад
Родитель
Сommit
7c52b033a1
2 измененных файлов с 36 добавлено и 1 удалено
  1. 35 0
      bash/bash.patch
  2. 1 1
      bash/bash.spec

+ 35 - 0
bash/bash.patch

@@ -199,3 +199,38 @@ Index: lib/sh/strftime.c
  #else /* !HAVE_TZNAME */
  			off = -zone.tz_minuteswest;
  #endif /* !HAVE_TZNAME */
+
+-----------------------------------------------------------------------------
+
+Fix segfault when accessing an unset array.
+http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00026.html
+
+Index: arrayfunc.c
+--- arrayfunc.c.orig	2003-12-19 06:03:09 +0100
++++ arrayfunc.c	2004-08-11 15:17:03 +0200
+@@ -611,7 +611,7 @@
+   var = find_variable (t);
+ 
+   free (t);
+-  return var;
++  return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
+ }
+ 
+ /* Return a string containing the elements in the array and subscript
+
+-----------------------------------------------------------------------------
+
+Fix nested brace vs. variable expansion.
+http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00056.html
+
+Index: braces.c
+--- braces.c.orig	2003-12-04 17:09:52 +0100
++++ braces.c	2004-08-11 15:18:14 +0200
+@@ -402,6 +402,7 @@
+ 	{
+ 	  pass_next = 1;
+ 	  i++;
++	  level++;
+ 	  continue;
+ 	}
+ #endif

+ 1 - 1
bash/bash.spec

@@ -40,7 +40,7 @@ Class:        CORE
 Group:        Shell
 License:      GPL
 Version:      %{V_base_real}.%{V_plvl_raw}
-Release:      20040806
+Release:      20040811
 
 #   list of sources
 Source0:      ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz