mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-07-16 00:20:49 +02:00
Bash-5.2 patch 21: fix for expanding command substitutions in a word expansion in a here-document
This commit is contained in:
+1
-1
@@ -25,6 +25,6 @@
|
|||||||
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
||||||
looks for to find the patch level (for the sccs version string). */
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
#define PATCHLEVEL 20
|
#define PATCHLEVEL 21
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
|||||||
@@ -1693,7 +1693,7 @@ extract_heredoc_dolbrace_string (string, sindex, quoted, flags)
|
|||||||
t = extract_command_subst (string, &si, flags);
|
t = extract_command_subst (string, &si, flags);
|
||||||
CHECK_STRING_OVERRUN (i, si, slen, c);
|
CHECK_STRING_OVERRUN (i, si, slen, c);
|
||||||
|
|
||||||
tlen = si - i - 1;
|
tlen = si - i - 2;
|
||||||
RESIZE_MALLOCED_BUFFER (result, result_index, tlen + 4, result_size, 64);
|
RESIZE_MALLOCED_BUFFER (result, result_index, tlen + 4, result_size, 64);
|
||||||
result[result_index++] = c;
|
result[result_index++] = c;
|
||||||
result[result_index++] = LPAREN;
|
result[result_index++] = LPAREN;
|
||||||
@@ -1713,7 +1713,7 @@ extract_heredoc_dolbrace_string (string, sindex, quoted, flags)
|
|||||||
t = extract_process_subst (string, (string[i] == '<' ? "<(" : ">)"), &si, flags);
|
t = extract_process_subst (string, (string[i] == '<' ? "<(" : ">)"), &si, flags);
|
||||||
CHECK_STRING_OVERRUN (i, si, slen, c);
|
CHECK_STRING_OVERRUN (i, si, slen, c);
|
||||||
|
|
||||||
tlen = si - i - 1;
|
tlen = si - i - 2;
|
||||||
RESIZE_MALLOCED_BUFFER (result, result_index, tlen + 4, result_size, 64);
|
RESIZE_MALLOCED_BUFFER (result, result_index, tlen + 4, result_size, 64);
|
||||||
result[result_index++] = c;
|
result[result_index++] = c;
|
||||||
result[result_index++] = LPAREN;
|
result[result_index++] = LPAREN;
|
||||||
|
|||||||
Reference in New Issue
Block a user