diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:03:09 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:03:09 -0500 |
| commit | b4d40164691e23c7c546daa57c411907a2c2e8cf (patch) | |
| tree | a55f1469cb4495a2366eb39c07d8dc1ff3729820 | |
| parent | b4a8651a5f48c673ae4aec4b191569b46bb89d41 (diff) | |
| download | bash-b4d40164691e23c7c546daa57c411907a2c2e8cf.tar.gz | |
Bash-4.2 patch 17
| -rw-r--r-- | builtins/read.def | 6 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtins/read.def b/builtins/read.def index c4a668a6..1b87faae 100644 --- a/builtins/read.def +++ b/builtins/read.def @@ -642,6 +642,12 @@ assign_vars: xfree (input_string); return EXECUTION_FAILURE; /* readonly or noassign */ } + if (assoc_p (var)) + { + builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); + xfree (input_string); + return EXECUTION_FAILURE; /* existing associative array */ + } array_flush (array_cell (var)); alist = list_string (input_string, ifs_chars, 0); diff --git a/patchlevel.h b/patchlevel.h index dd41e764..5de379f2 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 16 +#define PATCHLEVEL 17 #endif /* _PATCHLEVEL_H_ */ |