package/bash/bash44-008.patch

   1 From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-008
   2
   3 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
   4
   5                              BASH PATCH REPORT
   6                              =================
   7
   8 Bash-Release:   4.4
   9 Patch-ID:       bash44-008
  10
  11 Bug-Reported-by:        Koichi MURASE <myoga.murase@gmail.com>
  12 Bug-Reference-ID:       <CAFLRLk-V+1AeQ2k=pY7ih6V+MfQ_w8EF3YWL2E+wmLfgKBtzXA@mail.gmail.com>
  13 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html
  14
  15 Bug-Description:
  16
  17 Under certain circumstances, bash will evaluate arithmetic expressions as
  18 part of reading an expression token even when evaluation is suppressed. This
  19 happens while evaluating a conditional expression and skipping over the
  20 failed branch of the expression.
  21
  22 Patch (apply with `patch -p0'):
  23
  24 *** bash-4.4-patched/expr.c     2015-10-11 14:46:36.000000000 -0400
  25 --- b/expr.c    2016-11-08 11:55:46.000000000 -0500
  26 ***************
  27 *** 579,585 ****
  28     if (curtok == QUES)         /* found conditional expr */
  29       {
  30 -       readtok ();
  31 -       if (curtok == 0 || curtok == COL)
  32 -       evalerror (_("expression expected"));
  33         if (cval == 0)
  34         {
  35 --- b/579,582 ----
  36 ***************
  37 *** 588,591 ****
  38 --- b/585,592 ----
  39         }
  40
  41 +       readtok ();
  42 +       if (curtok == 0 || curtok == COL)
  43 +       evalerror (_("expression expected"));
  44 +
  45         val1 = EXP_HIGHEST ();
  46
  47 ***************
  48 *** 594,600 ****
  49         if (curtok != COL)
  50         evalerror (_("`:' expected for conditional expression"));
  51 !       readtok ();
  52 !       if (curtok == 0)
  53 !       evalerror (_("expression expected"));
  54         set_noeval = 0;
  55         if (cval)
  56 --- b/595,599 ----
  57         if (curtok != COL)
  58         evalerror (_("`:' expected for conditional expression"));
  59 !
  60         set_noeval = 0;
  61         if (cval)
  62 ***************
  63 *** 604,608 ****
  64 --- b/603,611 ----
  65         }
  66
  67 +       readtok ();
  68 +       if (curtok == 0)
  69 +       evalerror (_("expression expected"));
  70         val2 = expcond ();
  71 +
  72         if (set_noeval)
  73         noeval--;
  74 *** bash-4.4/patchlevel.h       2016-06-22 14:51:03.000000000 -0400
  75 --- b/patchlevel.h      2016-10-01 11:01:28.000000000 -0400
  76 ***************
  77 *** 26,30 ****
  78      looks for to find the patch level (for the sccs version string). */
  79
  80 ! #define PATCHLEVEL 7
  81
  82   #endif /* _PATCHLEVEL_H_ */
  83 --- b/26,30 ----
  84      looks for to find the patch level (for the sccs version string). */
  85
  86 ! #define PATCHLEVEL 8
  87
  88   #endif /* _PATCHLEVEL_H_ */