]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/bash/bash32-021
Merge branch 'strongswan-5' into thirteen
[people/teissler/ipfire-2.x.git] / src / patches / bash / bash32-021
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 3.2
5 Patch-ID: bash32-021
6
7 Bug-Reported-by: BAGSHAW Paul RD-TECH-REN <paul.bagshaw@orange-ftgroup.com>
8 Bug-Reference-ID: <941BA0BF46DB8F4983FF7C8AFE800BC205EA7D4B@ftrdmel3.rd.francetelecom.fr>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00065.html
10
11 Bug-Description:
12
13 When the parser read a backslash-escaped character that would be treated
14 internally as an escape, it would double the number of escape characters.
15
16 Patch:
17
18 *** ../bash-3.2-patched/parse.y Mon Oct 30 17:22:00 2006
19 --- parse.y Sat Mar 24 17:13:20 2007
20 ***************
21 *** 3377,3381 ****
22 {
23 pass_next_character = 0;
24 ! goto got_character;
25 }
26
27 --- 3377,3381 ----
28 {
29 pass_next_character = 0;
30 ! goto got_escaped_character;
31 }
32
33 ***************
34 *** 3651,3660 ****
35 got_character:
36
37 - all_digit_token &= DIGIT (character);
38 - dollar_present |= character == '$';
39 -
40 if (character == CTLESC || character == CTLNUL)
41 token[token_index++] = CTLESC;
42
43 token[token_index++] = character;
44
45 --- 3651,3662 ----
46 got_character:
47
48 if (character == CTLESC || character == CTLNUL)
49 token[token_index++] = CTLESC;
50
51 + got_escaped_character:
52 +
53 + all_digit_token &= DIGIT (character);
54 + dollar_present |= character == '$';
55 +
56 token[token_index++] = character;
57
58 *** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
59 --- patchlevel.h Mon Oct 16 14:22:54 2006
60 ***************
61 *** 26,30 ****
62 looks for to find the patch level (for the sccs version string). */
63
64 ! #define PATCHLEVEL 20
65
66 #endif /* _PATCHLEVEL_H_ */
67 --- 26,30 ----
68 looks for to find the patch level (for the sccs version string). */
69
70 ! #define PATCHLEVEL 21
71
72 #endif /* _PATCHLEVEL_H_ */