projects / packages / bash.git / blame
| Commit | Line | Data |
|---|---|---|
| e5ec3c9c ER |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 4.2 | |
| 5 | Patch-ID: bash42-028 | |
| 6 | ||
| 7 | Bug-Reported-by: Mark Edgar <medgar123@gmail.com> | |
| 8 | Bug-Reference-ID: <CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com> | |
| 9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | When using a word expansion for which the right hand side is evaluated, | |
| 14 | certain expansions of quoted null strings include spurious ^? characters. | |
| 15 | ||
| 16 | Patch (apply with `patch -p0'): | |
| 17 | ||
| 18 | *** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400 | |
| 19 | --- subst.c 2012-03-20 19:30:13.000000000 -0400 | |
| 20 | *************** | |
| 21 | *** 5810,5813 **** | |
| 22 | --- 5810,5823 ---- | |
| 23 | if (qdollaratp && ((hasdol && quoted) || l->next)) | |
| 24 | *qdollaratp = 1; | |
| 25 | + /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is | |
| 26 | + a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the | |
| 27 | + flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the | |
| 28 | + expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) | |
| 29 | + (which is more paranoia than anything else), we need to return the | |
| 30 | + quoted null string and set the flags to indicate it. */ | |
| 31 | + if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) | |
| 32 | + { | |
| 33 | + w->flags |= W_HASQUOTEDNULL; | |
| 34 | + } | |
| 35 | dispose_words (l); | |
| 36 | } | |
| 37 | ||
| 38 | *** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 | |
| 39 | --- patchlevel.h Thu Feb 24 21:41:34 2011 | |
| 40 | *************** | |
| 41 | *** 26,30 **** | |
| 42 | looks for to find the patch level (for the sccs version string). */ | |
| 43 | ||
| 44 | ! #define PATCHLEVEL 27 | |
| 45 | ||
| 46 | #endif /* _PATCHLEVEL_H_ */ | |
| 47 | --- 26,30 ---- | |
| 48 | looks for to find the patch level (for the sccs version string). */ | |
| 49 | ||
| 50 | ! #define PATCHLEVEL 28 | |
| 51 | ||
| 52 | #endif /* _PATCHLEVEL_H_ */ |