aboutsummaryrefslogtreecommitdiffstats
path: root/builtins
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:03:09 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:03:09 -0500
commitb4d40164691e23c7c546daa57c411907a2c2e8cf (patch)
treea55f1469cb4495a2366eb39c07d8dc1ff3729820 /builtins
parentb4a8651a5f48c673ae4aec4b191569b46bb89d41 (diff)
downloadandroid_external_bash-b4d40164691e23c7c546daa57c411907a2c2e8cf.tar.gz
android_external_bash-b4d40164691e23c7c546daa57c411907a2c2e8cf.tar.bz2
android_external_bash-b4d40164691e23c7c546daa57c411907a2c2e8cf.zip
Bash-4.2 patch 17
Diffstat (limited to 'builtins')
-rw-r--r--builtins/read.def6
1 files changed, 6 insertions, 0 deletions
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);