Bash-4.3 patch 46

diff --git a/patchlevel.h b/patchlevel.h
index beea6887f2bbce912ecb7982db19c1bce82b6109..22bb68c0c7bac881ec058cbd0b63af042056994b 100644 (file)
--- 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 45
+#define PATCHLEVEL 46
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/subst.c b/subst.c
index 961750c4ff1c7706d7df949969e2a13b6625ba42..3958237b06dce7daa61e9c252187f70dd4248fbd 100644 (file)
--- a/subst.c
+++ b/subst.c
@@ -9561,7 +9561,14 @@ shell_expand_word_list (tlist, eflags)
 
          opts[opti] = '\0';
          if (opti > 0)
-           make_internal_declare (tlist->word->word, opts);
+           {
+             t = make_internal_declare (tlist->word->word, opts);
+             if (t != EXECUTION_SUCCESS)
+               {
+                 last_command_exit_value = t;
+                 exp_jump_to_top_level (DISCARD);
+               }
+           }
 
          t = do_word_assignment (tlist->word, 0);
          if (t == 0)