components/shell/bash/patches/bash52-007.patch

   1                              BASH PATCH REPORT
   2                              =================
   3
   4 Bash-Release:   5.2
   5 Patch-ID:       bash52-007
   6
   7 Bug-Reported-by:        Bruce Jerrick
   8 Bug-Reference-ID:
   9 Bug-Reference-URL:      https://bugzilla.redhat.com/show_bug.cgi?id=2134307
  10
  11 Bug-Description:
  12
  13 This patch fixes several problems with alias expansion inside command
  14 substitutions when in POSIX mode.
  15
  16 Patch (apply with `patch -p0'):
  17
  18 *** /fs1/chet/scratch/bash-5.2.6/parse.y        2022-11-02 10:36:54.000000000 -0400
  19 --- parse.y     2022-10-24 10:53:26.000000000 -0400
  20 ***************
  21 *** 3613,3616 ****
  22 --- 3614,3618 ----
  23   #define P_ARRAYSUB    0x0020  /* parsing a [...] array subscript for assignment */
  24   #define P_DOLBRACE    0x0040  /* parsing a ${...} construct */
  25 + #define P_ARITH               0x0080  /* parsing a $(( )) arithmetic expansion */
  26
  27   /* Lexical state while parsing a grouping construct or $(...). */
  28 ***************
  29 *** 3911,3914 ****
  30 --- 3914,3920 ----
  31           else if ((flags & (P_ARRAYSUB|P_DOLBRACE)) && (tflags & LEX_WASDOL) && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
  32             goto parse_dollar_word;
  33 +         else if ((flags & P_ARITH) && (tflags & LEX_WASDOL) && ch == '(') /*)*/
  34 +           /* $() inside $(( ))/$[ ] */
  35 +           goto parse_dollar_word;
  36   #if defined (PROCESS_SUBSTITUTION)
  37           /* XXX - technically this should only be recognized at the start of
  38 ***************
  39 *** 3941,3945 ****
  40             nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
  41           else if (ch == '[')           /* ] */
  42 !           nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags);
  43
  44           CHECK_NESTRET_ERROR ();
  45 --- 3947,3951 ----
  46             nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
  47           else if (ch == '[')           /* ] */
  48 !           nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags|P_ARITH);
  49
  50           CHECK_NESTRET_ERROR ();
  51 ***************
  52 *** 4080,4084 ****
  53         shell_ungetc (peekc);
  54         if (peekc == '(')               /*)*/
  55 !       return (parse_matched_pair (qc, open, close, lenp, 0));
  56       }
  57
  58 --- 4086,4090 ----
  59         shell_ungetc (peekc);
  60         if (peekc == '(')               /*)*/
  61 !       return (parse_matched_pair (qc, open, close, lenp, P_ARITH));
  62       }
  63
  64 ***************
  65 *** 4501,4505 ****
  66
  67     exp_lineno = line_number;
  68 !   ttok = parse_matched_pair (0, '(', ')', &ttoklen, 0);
  69     rval = 1;
  70     if (ttok == &matched_pair_error)
  71 --- 4512,4516 ----
  72
  73     exp_lineno = line_number;
  74 !   ttok = parse_matched_pair (0, '(', ')', &ttoklen, P_ARITH);
  75     rval = 1;
  76     if (ttok == &matched_pair_error)
  77 ***************
  78 *** 5016,5020 ****
  79                 }
  80               else
  81 !               ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0);
  82               if (ttok == &matched_pair_error)
  83                 return -1;              /* Bail immediately. */
  84 --- 5030,5034 ----
  85                 }
  86               else
  87 !               ttok = parse_matched_pair (cd, '[', ']', &ttoklen, P_ARITH);
  88               if (ttok == &matched_pair_error)
  89                 return -1;              /* Bail immediately. */
  90 *** ../bash-5.2.6/y.tab.c       2022-11-02 10:36:54.000000000 -0400
  91 --- y.tab.c     2022-11-02 10:55:58.000000000 -0400
  92 ***************
  93 *** 5924,5927 ****
  94 --- 5924,5928 ----
  95   #define P_ARRAYSUB    0x0020  /* parsing a [...] array subscript for assignment */
  96   #define P_DOLBRACE    0x0040  /* parsing a ${...} construct */
  97 + #define P_ARITH               0x0080  /* parsing a $(( )) arithmetic expansion */
  98
  99   /* Lexical state while parsing a grouping construct or $(...). */
 100 ***************
 101 *** 6222,6225 ****
 102 --- 6223,6229 ----
 103           else if ((flags & (P_ARRAYSUB|P_DOLBRACE)) && (tflags & LEX_WASDOL) && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
 104             goto parse_dollar_word;
 105 +         else if ((flags & P_ARITH) && (tflags & LEX_WASDOL) && ch == '(') /*)*/
 106 +           /* $() inside $(( ))/$[ ] */
 107 +           goto parse_dollar_word;
 108   #if defined (PROCESS_SUBSTITUTION)
 109           /* XXX - technically this should only be recognized at the start of
 110 ***************
 111 *** 6252,6256 ****
 112             nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
 113           else if (ch == '[')           /* ] */
 114 !           nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags);
 115
 116           CHECK_NESTRET_ERROR ();
 117 --- 6256,6260 ----
 118             nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P_DOLBRACE|rflags);
 119           else if (ch == '[')           /* ] */
 120 !           nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags|P_ARITH);
 121
 122           CHECK_NESTRET_ERROR ();
 123 ***************
 124 *** 6391,6395 ****
 125         shell_ungetc (peekc);
 126         if (peekc == '(')               /*)*/
 127 !       return (parse_matched_pair (qc, open, close, lenp, 0));
 128       }
 129
 130 --- 6395,6399 ----
 131         shell_ungetc (peekc);
 132         if (peekc == '(')               /*)*/
 133 !       return (parse_matched_pair (qc, open, close, lenp, P_ARITH));
 134       }
 135
 136 ***************
 137 *** 6812,6816 ****
 138
 139     exp_lineno = line_number;
 140 !   ttok = parse_matched_pair (0, '(', ')', &ttoklen, 0);
 141     rval = 1;
 142     if (ttok == &matched_pair_error)
 143 --- 6816,6820 ----
 144
 145     exp_lineno = line_number;
 146 !   ttok = parse_matched_pair (0, '(', ')', &ttoklen, P_ARITH);
 147     rval = 1;
 148     if (ttok == &matched_pair_error)
 149 ***************
 150 *** 7327,7331 ****
 151                 }
 152               else
 153 !               ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0);
 154               if (ttok == &matched_pair_error)
 155                 return -1;              /* Bail immediately. */
 156 --- 7331,7335 ----
 157                 }
 158               else
 159 !               ttok = parse_matched_pair (cd, '[', ']', &ttoklen, P_ARITH);
 160               if (ttok == &matched_pair_error)
 161                 return -1;              /* Bail immediately. */
 162 *** /fs1/chet/scratch/bash-5.2.6/builtins/evalstring.c  2022-07-18 14:46:56.000000000 -0400
 163 --- builtins/evalstring.c       2022-10-18 10:57:51.000000000 -0400
 164 ***************
 165 *** 432,435 ****
 166 --- 432,437 ----
 167         if (parse_command () == 0)
 168         {
 169 +         int local_expalias, local_alflag;
 170 +
 171           if ((flags & SEVAL_PARSEONLY) || (interactive_shell == 0 && read_but_dont_execute))
 172             {
 173 ***************
 174 *** 508,511 ****
 175 --- 510,526 ----
 176   #endif /* ONESHOT */
 177
 178 +             /* We play tricks in the parser and command_substitute() turning
 179 +                expand_aliases on and off depending on which parsing pass and
 180 +                whether or not we're in posix mode. This only matters for
 181 +                parsing, and we let the higher layers deal with that. We just
 182 +                want to ensure that expand_aliases is set to the appropriate
 183 +                global value when we go to execute this command, so we save
 184 +                and restore it around the execution (we don't restore it if
 185 +                the global value of the flag (expaliases_flag) changes). */
 186 +             local_expalias = expand_aliases;
 187 +             local_alflag = expaliases_flag;
 188 +             if (subshell_environment & SUBSHELL_COMSUB)
 189 +               expand_aliases = expaliases_flag;
 190 +
 191               /* See if this is a candidate for $( <file ). */
 192               if (startup_state == 2 &&
 193 ***************
 194 *** 525,528 ****
 195 --- 540,547 ----
 196               discard_unwind_frame ("pe_dispose");
 197
 198 +             /* If the global value didn't change, we restore what we had. */
 199 +             if ((subshell_environment & SUBSHELL_COMSUB) && local_alflag == expaliases_flag)
 200 +               expand_aliases = local_expalias;
 201 +
 202               if (flags & SEVAL_ONECMD)
 203                 {
 204 *** /fs1/chet/scratch/bash-5.2.6/command.h      2021-04-30 15:43:15.000000000 -0400
 205 --- command.h   2022-10-18 11:44:31.000000000 -0400
 206 ***************
 207 *** 115,118 ****
 208 --- 115,119 ----
 209   #define PF_EXPANDRHS  0x20    /* same as W_EXPANDRHS */
 210   #define PF_ALLINDS    0x40    /* array, act as if [@] was supplied */
 211 + #define PF_BACKQUOTE  0x80    /* differentiate `` from $() for command_substitute */
 212
 213   /* Possible values for subshell_environment */
 214 *** /fs1/chet/scratch/bash-5.2.6/subst.c        2022-11-02 10:28:10.000000000 -0400
 215 --- subst.c     2022-10-20 12:41:07.000000000 -0400
 216 ***************
 217 *** 7124,7129 ****
 218
 219         /* We want to expand aliases on this pass if we are not in posix mode
 220 !        for backwards compatibility. */
 221 !       if (expand_aliases)
 222           expand_aliases = posixly_correct == 0;
 223
 224 --- 7133,7142 ----
 225
 226         /* We want to expand aliases on this pass if we are not in posix mode
 227 !        for backwards compatibility. parse_and_execute() takes care of
 228 !        setting expand_aliases back to the global value when executing the
 229 !        parsed string. We only do this for $(...) command substitution,
 230 !        since that is what parse_comsub handles; `` comsubs are processed
 231 !        using parse.y:parse_matched_pair(). */
 232 !       if (expand_aliases && (flags & PF_BACKQUOTE) == 0)
 233           expand_aliases = posixly_correct == 0;
 234
 235 ***************
 236 *** 11293,11297 ****
 237               {
 238                 de_backslash (temp);
 239 !               tword = command_substitute (temp, quoted, 0);
 240                 temp1 = tword ? tword->word : (char *)NULL;
 241                 if (tword)
 242 --- 11306,11310 ----
 243               {
 244                 de_backslash (temp);
 245 !               tword = command_substitute (temp, quoted, PF_BACKQUOTE);
 246                 temp1 = tword ? tword->word : (char *)NULL;
 247                 if (tword)
 248 *** ../bash-5.2/patchlevel.h    2020-06-22 14:51:03.000000000 -0400
 249 --- patchlevel.h        2020-10-01 11:01:28.000000000 -0400
 250 ***************
 251 *** 26,30 ****
 252      looks for to find the patch level (for the sccs version string). */
 253
 254 ! #define PATCHLEVEL 6
 255
 256   #endif /* _PATCHLEVEL_H_ */
 257 --- 26,30 ----
 258      looks for to find the patch level (for the sccs version string). */
 259
 260 ! #define PATCHLEVEL 7
 261
 262   #endif /* _PATCHLEVEL_H_ */