LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.4 patch 8

Browse Source
This commit is contained in:
Chet Ramey
2017-01-20 15:38:10 -05:00
parent 4f747edc62
commit b9f81c2977
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
expr.c
View File

@@ -578,24 +578,23 @@ expcond ()
rval = cval = explor (); rval = cval = explor ();
if (curtok == QUES) /* found conditional expr */ if (curtok == QUES) /* found conditional expr */
{ {
readtok ();
if (curtok == 0 || curtok == COL)
evalerror (_("expression expected"));
if (cval == 0) if (cval == 0)
{ {
set_noeval = 1; set_noeval = 1;
noeval++; noeval++;
} }
readtok ();
if (curtok == 0 || curtok == COL)
evalerror (_("expression expected"));
val1 = EXP_HIGHEST (); val1 = EXP_HIGHEST ();
if (set_noeval) if (set_noeval)
noeval--; noeval--;
if (curtok != COL) if (curtok != COL)
evalerror (_("`:' expected for conditional expression")); evalerror (_("`:' expected for conditional expression"));
readtok ();
if (curtok == 0)
evalerror (_("expression expected"));
set_noeval = 0; set_noeval = 0;
if (cval) if (cval)
{ {
@@ -603,7 +602,11 @@ expcond ()
noeval++; noeval++;
} }
readtok ();
if (curtok == 0)
evalerror (_("expression expected"));
val2 = expcond (); val2 = expcond ();
if (set_noeval) if (set_noeval)
noeval--; noeval--;
rval = cval ? val1 : val2; rval = cval ? val1 : val2;

2
patchlevel.h
View File

@@ -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 7 #define PATCHLEVEL 8
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */