projects / people / ummeegge / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 415fb8b5 PM |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 5.0 | |
| 5 | Patch-ID: bash50-011 | |
| 6 | ||
| 7 | Bug-Reported-by: Matt Whitlock | |
| 8 | Bug-Reference-ID: | |
| 9 | Bug-Reference-URL: https://savannah.gnu.org/support/?109671 | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | The conditional command did not perform appropriate quoted null character | |
| 14 | removal on its arguments, causing syntax errors and attempts to stat | |
| 15 | invalid pathnames. | |
| 16 | ||
| 17 | Patch (apply with `patch -p0'): | |
| 18 | ||
| 19 | *** ../bash-5.0-patched/subst.c 2018-12-22 17:43:37.000000000 -0500 | |
| 20 | --- subst.c 2019-04-14 13:25:41.000000000 -0400 | |
| 21 | *************** | |
| 22 | *** 3626,3630 **** | |
| 23 | SPECIAL is 2, this is an rhs argument for the =~ operator, and should | |
| 24 | be quoted appropriately for regcomp/regexec. The caller is responsible | |
| 25 | ! for removing the backslashes if the unquoted word is needed later. */ | |
| 26 | char * | |
| 27 | cond_expand_word (w, special) | |
| 28 | --- 3642,3648 ---- | |
| 29 | SPECIAL is 2, this is an rhs argument for the =~ operator, and should | |
| 30 | be quoted appropriately for regcomp/regexec. The caller is responsible | |
| 31 | ! for removing the backslashes if the unquoted word is needed later. In | |
| 32 | ! any case, since we don't perform word splitting, we need to do quoted | |
| 33 | ! null character removal. */ | |
| 34 | char * | |
| 35 | cond_expand_word (w, special) | |
| 36 | *************** | |
| 37 | *** 3647,3650 **** | |
| 38 | --- 3665,3670 ---- | |
| 39 | if (special == 0) /* LHS */ | |
| 40 | { | |
| 41 | + if (l->word) | |
| 42 | + word_list_remove_quoted_nulls (l); | |
| 43 | dequote_list (l); | |
| 44 | r = string_list (l); | |
| 45 | *** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 | |
| 46 | --- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 | |
| 47 | *************** | |
| 48 | *** 26,30 **** | |
| 49 | looks for to find the patch level (for the sccs version string). */ | |
| 50 | ||
| 51 | ! #define PATCHLEVEL 10 | |
| 52 | ||
| 53 | #endif /* _PATCHLEVEL_H_ */ | |
| 54 | --- 26,30 ---- | |
| 55 | looks for to find the patch level (for the sccs version string). */ | |
| 56 | ||
| 57 | ! #define PATCHLEVEL 11 | |
| 58 | ||
| 59 | #endif /* _PATCHLEVEL_H_ */ |