summaryrefslogtreecommitdiffstats
path: root/source/a/bash/bash-5.0-patches/bash50-015
blob: ff6e5e69d6e32601b269b265d87e62206acd8b29 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
			     BASH PATCH REPORT
			     =================

Bash-Release:	5.0
Patch-ID:	bash50-015

Bug-Reported-by:	Yu Kou <ckyoog@gmail.com>
Bug-Reference-ID:	<CAAqoF9Ko3nAShJXGzucafs-ByUagzZ4nbQonwEkwC7s9UqfWKw@mail.gmail.com>
Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00032.html

Bug-Description:

If alias expansion is enabled when processing the command argument to the
`-c' option, an alias is defined in that command, and the command ends with
the invocation of that alias, the shell's command parser can prematurely
terminate before the entire command is executed.

Patch (apply with `patch -p0'):

*** ../bash-20190426/builtins/evalstring.c	2019-01-29 14:15:19.000000000 -0500
--- builtins/evalstring.c	2019-05-15 14:19:36.000000000 -0400
***************
*** 92,95 ****
--- 92,96 ----
  	  running_trap == 0 &&
  	  *bash_input.location.string == '\0' &&
+ 	  parser_expanding_alias () == 0 &&
  	  command->type == cm_simple &&
  	  signal_is_trapped (EXIT_TRAP) == 0 &&
***************
*** 106,109 ****
--- 107,111 ----
  {
    return (*bash_input.location.string == '\0' &&
+ 	  parser_expanding_alias () == 0 &&
  	  (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
  	  command->value.Connection->second->type == cm_simple);
***************
*** 291,295 ****
    with_input_from_string (string, from_file);
    clear_shell_input_line ();
!   while (*(bash_input.location.string))
      {
        command = (COMMAND *)NULL;
--- 293,297 ----
    with_input_from_string (string, from_file);
    clear_shell_input_line ();
!   while (*(bash_input.location.string) || parser_expanding_alias ())
      {
        command = (COMMAND *)NULL;
***************
*** 546,550 ****
  
    with_input_from_string (string, from_file);
!   while (*(bash_input.location.string))
      {
        command = (COMMAND *)NULL;
--- 548,552 ----
  
    with_input_from_string (string, from_file);
!   while (*(bash_input.location.string))		/* XXX - parser_expanding_alias () ? */
      {
        command = (COMMAND *)NULL;
*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 14
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 15
  
  #endif /* _PATCHLEVEL_H_ */