From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 01:03:09 +0000 (-0500)
Subject: Bash-4.2 patch 17
X-Git-Tag: bash-4.3~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d40164691e23c7c546daa57c411907a2c2e8cf;p=thirdparty%2Fbash.git

Bash-4.2 patch 17
---

diff --git a/builtins/read.def b/builtins/read.def
index c4a668a66..1b87faaef 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 dd41e764a..5de379f28 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_ */