1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
#! /bin/sh -e
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
elif [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
-unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
# DP: bash-2.05b upstream patch 005
BASH PATCH REPORT
=================
Bash-Release: 2.05b
Patch-ID: bash205b-005
Bug-Reported-by: Jim Meyering <jim@meyering.net>
Bug-Reference-ID: <87bs6v8iib.fsf@pixie.eng.ascend.com>
Bug-Reference-URL: http://mail.gnu.org/archive/html/bug-bash/2002-09/msg00047.html
Bug-Description:
When in a locale with multibyte characters, the readline display updater
will occasionally cause a segmentation fault when attempting to compute
the length of the first multibyte character on the line.
Patch:
*** ../bash-2.05b/lib/readline/mbutil.c Tue Jun 4 11:54:29 2002
--- lib/readline/mbutil.c Mon Aug 5 11:20:39 2002
***************
*** 206,210 ****
{
/* shorted to compose multibyte char */
! memset (ps, 0, sizeof(mbstate_t));
return -2;
}
--- 206,211 ----
{
/* shorted to compose multibyte char */
! if (ps)
! memset (ps, 0, sizeof(mbstate_t));
return -2;
}
***************
*** 213,217 ****
/* invalid to compose multibyte char */
/* initialize the conversion state */
! memset (ps, 0, sizeof(mbstate_t));
return -1;
}
--- 214,219 ----
/* invalid to compose multibyte char */
/* initialize the conversion state */
! if (ps)
! memset (ps, 0, sizeof(mbstate_t));
return -1;
}
***************
*** 226,232 ****
int
_rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
! char *buf1, *buf2;
! mbstate_t *ps1, *ps2;
! int pos1, pos2;
{
int i, w1, w2;
--- 228,237 ----
int
_rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
! char *buf1;
! int pos1;
! mbstate_t *ps1;
! char *buf2;
! int pos2;
! mbstate_t *ps2;
{
int i, w1, w2;
***************
*** 277,282 ****
/* clear the state of the byte sequence, because
in this case effect of mbstate is undefined */
! memset (ps, 0, sizeof (mbstate_t));
}
else
pos += tmp;
--- 282,290 ----
/* clear the state of the byte sequence, because
in this case effect of mbstate is undefined */
! if (ps)
! memset (ps, 0, sizeof (mbstate_t));
}
+ else if (tmp == 0)
+ pos++;
else
pos += tmp;
|
