commit bash-20050210 snapshot

1 files changed, 1 insertions, 10 deletions

diff --git a/arrayfunc.c~ b/arrayfunc.c~
index fc4adb5b..c1b589f7 100644
--- a/arrayfunc.c~
+++ b/arrayfunc.c~
@@ -385,16 +385,7 @@ assign_array_var_from_string (var, value, flags)
 
       if (integer_p (var))
 	this_command_name = (char *)NULL;	/* no command name for errors */
-#if 0
-      nval = make_variable_value (var, val, flags);
-      if (var->assign_func)
-	(*var->assign_func) (var, nval, ind);
-      else
-	array_insert (a, ind, nval);
-      FREE (nval);
-#else
       bind_array_var_internal (var, ind, val, flags);
-#endif
       last_ind++;
     }
 
@@ -717,7 +708,7 @@ array_value_internal (s, quoted, allow_all, rtype)
 	  err_badarraysub (s);
 	  return ((char *)NULL);
 	}
-      else if (var == 0)
+      else if (var == 0 || value_cell (var) == 0)
 	return ((char *)NULL);
       else if (array_p (var) == 0)
 	l = add_string_to_list (value_cell (var), (WORD_LIST *)NULL);