From e62bcdd385636b3e3998d926d5fed9a07f4173ab Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 8 Dec 2012 00:34:11 -0800 Subject: [PATCH] applying bash42-017 --- builtins/read.def | 6 ++++++ patchlevel.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/builtins/read.def b/builtins/read.def index c4a668a..1b87faa 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 dd41e76..5de379f 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_ */ -- 2.7.4