diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:54:19 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-03-28 11:54:19 -0400 |
| commit | 01657c6474ca4f90df0fbb47001e2e744aaaddb0 (patch) | |
| tree | e42459582558b5e8754213ca1d5f3b655110bf8d | |
| parent | 22205f43abedd7b0dbb553e5449a321d3669e881 (diff) | |
| download | android_external_bash-01657c6474ca4f90df0fbb47001e2e744aaaddb0.tar.gz android_external_bash-01657c6474ca4f90df0fbb47001e2e744aaaddb0.tar.bz2 android_external_bash-01657c6474ca4f90df0fbb47001e2e744aaaddb0.zip | |
Bash-4.3 patch 7
| -rw-r--r-- | arrayfunc.c | 5 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arrayfunc.c b/arrayfunc.c index b82767e..a89e67f 100644 --- a/arrayfunc.c +++ b/arrayfunc.c @@ -597,6 +597,11 @@ assign_compound_array_list (var, nlist, flags) if (assoc_p (var)) { val = expand_assignment_string_to_string (val, 0); + if (val == 0) + { + val = (char *)xmalloc (1); + val[0] = '\0'; /* like do_assignment_internal */ + } free_val = 1; } diff --git a/patchlevel.h b/patchlevel.h index 7e887f6..fc8c97f 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -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 6 +#define PATCHLEVEL 7 #endif /* _PATCHLEVEL_H_ */ |