pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-27 07:43:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bash-5.2 patch 29: fix for error recovery when parsing invalid compound assignments

Browse Source
This commit is contained in:
Chet Ramey
2024-08-01 11:34:42 -04:00
parent 7440bd8ba5
commit bc3e91dbec
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
+12 -3
View File
@@ -6470,10 +6470,15 @@ parse_string_to_word_list (s, flags, whom)
if (wl == &parse_string_error)
{
set_exit_status (EXECUTION_FAILURE);
current_token = '\n'; /* XXX */
if (interactive_shell == 0 && posixly_correct)
jump_to_top_level (FORCE_EOF);
else
jump_to_top_level (DISCARD);
{
if (executing && parse_and_execute_level == 0)
top_level_cleanup ();
jump_to_top_level (DISCARD);
}
}
return (REVERSE_LIST (wl, WORD_LIST *));
@@ -6537,11 +6542,15 @@ parse_compound_assignment (retlenp)
if (wl == &parse_string_error)
{
set_exit_status (EXECUTION_FAILURE);
last_read_token = '\n'; /* XXX */
last_read_token = current_token = '\n'; /* XXX */
if (interactive_shell == 0 && posixly_correct)
jump_to_top_level (FORCE_EOF);
else
jump_to_top_level (DISCARD);
{
if (executing && parse_and_execute_level == 0)
top_level_cleanup ();
jump_to_top_level (DISCARD);
}
}
if (wl)
patchlevel.h
+1 -1
View File
@@ -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 28
#define PATCHLEVEL 29
#endif /* _PATCHLEVEL_H_ */
y.tab.c
+12 -3
View File
@@ -8785,10 +8785,15 @@ parse_string_to_word_list (s, flags, whom)
if (wl == &parse_string_error)
{
set_exit_status (EXECUTION_FAILURE);
current_token = '\n'; /* XXX */
if (interactive_shell == 0 && posixly_correct)
jump_to_top_level (FORCE_EOF);
else
jump_to_top_level (DISCARD);
{
if (executing && parse_and_execute_level == 0)
top_level_cleanup ();
jump_to_top_level (DISCARD);
}
}
return (REVERSE_LIST (wl, WORD_LIST *));
@@ -8852,11 +8857,15 @@ parse_compound_assignment (retlenp)
if (wl == &parse_string_error)
{
set_exit_status (EXECUTION_FAILURE);
last_read_token = '\n'; /* XXX */
last_read_token = current_token = '\n'; /* XXX */
if (interactive_shell == 0 && posixly_correct)
jump_to_top_level (FORCE_EOF);
else
jump_to_top_level (DISCARD);
{
if (executing && parse_and_execute_level == 0)
top_level_cleanup ();
jump_to_top_level (DISCARD);
}
}
if (wl)