RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: bash Date: 09-May-2009 18:13:06
Branch: HEAD Handle: 2009050916130600
Modified files:
bash patchlevel.h
bash/builtins declare.def
Log:
- jbj: apply bash40-005.
Summary:
Revision Changes Path
1.2 +8 -1 bash/builtins/declare.def
1.6 +1 -1 bash/patchlevel.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: bash/builtins/declare.def
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 declare.def
--- bash/builtins/declare.def 9 May 2009 14:32:10 -0000 1.1.1.1
+++ bash/builtins/declare.def 9 May 2009 16:13:06 -0000 1.2
@@ -295,6 +295,13 @@
subscript_start = (char *)NULL;
if (t = strchr (name, '[')) /* ] */
{
+ /* If offset != 0 we have already validated any array reference */
+ if (offset == 0 && valid_array_reference (name) == 0)
+ {
+ sh_invalidid (name);
+ assign_error++;
+ NEXT_VARIABLE ();
+ }
subscript_start = t;
*t = '\0';
making_array_special = 1;
@@ -484,7 +491,7 @@
}
/* declare -a name[[n]] or declare name[n] makes name an indexed
array variable. */
- else if ((making_array_special || (flags_on & att_array)) && array_p
(var) == 0)
+ else if ((making_array_special || (flags_on & att_array)) && array_p
(var) == 0 && assoc_p (var) == 0)
var = convert_var_to_array (var);
#endif /* ARRAY_VARS */
@@ .
patch -p0 <<'@@ .'
Index: bash/patchlevel.h
============================================================================
$ cvs diff -u -r1.5 -r1.6 patchlevel.h
--- bash/patchlevel.h 9 May 2009 16:12:35 -0000 1.5
+++ bash/patchlevel.h 9 May 2009 16:13:06 -0000 1.6
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what
support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 4
+#define PATCHLEVEL 5
#endif /* _PATCHLEVEL_H_ */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
