author | Jon Tibble <meths@btinternet.com> |
Mon, 04 May 2015 14:04:39 +0100 | |
branch | oi_151a |
changeset 254 | 9c2a4ac793f0 |
permissions | -rw-r--r-- |
254
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
1 |
BASH PATCH REPORT |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
2 |
================= |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
3 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
4 |
Bash-Release: 4.0 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
5 |
Patch-ID: bash40-035 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
6 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
7 |
Bug-Reported-by: Freddy Vulto <[email protected]> |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
8 |
Bug-Reference-ID: <[email protected]> |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
9 |
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00044.html |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
10 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
11 |
Bug-Description: |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
12 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
13 |
Bash-4.0 incorrectly treated single and double quotes as delimiters rather |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
14 |
than introducing quoted strings when splitting the line into words for |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
15 |
programmable completion functions. |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
16 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
17 |
Patch: |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
18 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
19 |
*** ../bash-4.0-patched/pcomplete.c 2009-03-08 21:24:31.000000000 -0400 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
20 |
--- pcomplete.c 2009-09-26 16:30:16.000000000 -0400 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
21 |
*************** |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
22 |
*** 1176,1186 **** |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
23 |
WORD_LIST *ret; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
24 |
char *delims; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
25 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
26 |
! #if 0 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
27 |
! delims = "()<>;&| \t\n"; /* shell metacharacters break words */ |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
28 |
! #else |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
29 |
! delims = rl_completer_word_break_characters; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
30 |
! #endif |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
31 |
ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp); |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
32 |
return (ret); |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
33 |
} |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
34 |
--- 1176,1188 ---- |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
35 |
WORD_LIST *ret; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
36 |
char *delims; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
37 |
+ int i, j; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
38 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
39 |
! delims = xmalloc (strlen (rl_completer_word_break_characters) + 1); |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
40 |
! for (i = j = 0; rl_completer_word_break_characters[i]; i++) |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
41 |
! if (rl_completer_word_break_characters[i] != '\'' && rl_completer_word_break_characters[i] != '"') |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
42 |
! delims[j++] = rl_completer_word_break_characters[i]; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
43 |
! delims[j] = '\0'; |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
44 |
ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp); |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
45 |
+ free (delims); |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
46 |
return (ret); |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
47 |
} |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
48 |
*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
49 |
--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
50 |
*************** |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
51 |
*** 26,30 **** |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
52 |
looks for to find the patch level (for the sccs version string). */ |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
53 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
54 |
! #define PATCHLEVEL 34 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
55 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
56 |
#endif /* _PATCHLEVEL_H_ */ |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
57 |
--- 26,30 ---- |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
58 |
looks for to find the patch level (for the sccs version string). */ |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
59 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
60 |
! #define PATCHLEVEL 35 |
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
61 |
|
9c2a4ac793f0
Bash patch catchup including shellshock
Jon Tibble <meths@btinternet.com>
parents:
diff
changeset
|
62 |
#endif /* _PATCHLEVEL_H_ */ |