From f1be666c7d78939ad775078d290bec2758fa29a2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Tue, 18 Nov 2008 13:15:12 +0000
Subject: Imported from ../bash-3.2.48.tar.gz.

---
 arrayfunc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'arrayfunc.c')

diff --git a/arrayfunc.c b/arrayfunc.c
index 48a099d..6bc248a 100644
--- a/arrayfunc.c
+++ b/arrayfunc.c
@@ -618,6 +618,8 @@ array_expand_index (s, len)
   if (expok == 0)
     {
       last_command_exit_value = EXECUTION_FAILURE;
+
+      top_level_cleanup ();      
       jump_to_top_level (DISCARD);
     }
   return val;
@@ -720,7 +722,7 @@ array_value_internal (s, quoted, allow_all, rtype)
   if (ALL_ELEMENT_SUB (t[0]) && t[1] == ']')
     {
       if (rtype)
-	*rtype = 1;
+	*rtype = (t[0] == '*') ? 1 : 2;
       if (allow_all == 0)
 	{
 	  err_badarraysub (s);
-- 
cgit v1.2.3