]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blame - src/patches/bash/bash32-025
Merge remote-tracking branch 'origin/next' into thirteen
[people/pmueller/ipfire-2.x.git] / src / patches / bash / bash32-025
CommitLineData
24acfa14
MT
1 BASH PATCH REPORT
2 =================
3
4Bash-Release: 3.2
5Patch-ID: bash32-025
6
7Bug-Reported-by: Tom Bjorkholm <tom.bjorkholm@ericsson.com>
8Bug-Reference-ID: <AEA1A32F001C6B4F98614B5B80D7647D01C075E9@esealmw115.eemea.ericsson.se>
9Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html
10
11Bug-Description:
12
13An off-by-one error in readline's input buffering caused readline to drop
14each 511th character of buffered input (e.g., when pasting a large amount
15of data into a terminal window).
16
17Patch:
18
19*** ../bash-3.2-patched/lib/readline/input.c Wed Aug 16 15:15:16 2006
20--- lib/readline/input.c Tue Jul 17 09:24:21 2007
21***************
22*** 134,139 ****
23
24 *key = ibuffer[pop_index++];
25!
26 if (pop_index >= ibuffer_len)
27 pop_index = 0;
28
29--- 134,142 ----
30
31 *key = ibuffer[pop_index++];
32! #if 0
33 if (pop_index >= ibuffer_len)
34+ #else
35+ if (pop_index > ibuffer_len)
36+ #endif
37 pop_index = 0;
38
39***************
40*** 251,255 ****
41 {
42 k = (*rl_getc_function) (rl_instream);
43! rl_stuff_char (k);
44 if (k == NEWLINE || k == RETURN)
45 break;
46--- 254,259 ----
47 {
48 k = (*rl_getc_function) (rl_instream);
49! if (rl_stuff_char (k) == 0)
50! break; /* some problem; no more room */
51 if (k == NEWLINE || k == RETURN)
52 break;
53***************
54*** 374,378 ****
55--- 378,386 ----
56 }
57 ibuffer[push_index++] = key;
58+ #if 0
59 if (push_index >= ibuffer_len)
60+ #else
61+ if (push_index > ibuffer_len)
62+ #endif
63 push_index = 0;
64
65*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
66--- patchlevel.h Mon Oct 16 14:22:54 2006
67***************
68*** 26,30 ****
69 looks for to find the patch level (for the sccs version string). */
70
71! #define PATCHLEVEL 24
72
73 #endif /* _PATCHLEVEL_H_ */
74--- 26,30 ----
75 looks for to find the patch level (for the sccs version string). */
76
77! #define PATCHLEVEL 25
78
79 #endif /* _PATCHLEVEL_H_ */