updated for version 7.3.365
Problem: Crash when using a large Unicode character in a file that has
syntax highlighting. (ngollan)
Solution: Check for going past the end of the utf tables. (Dominique Pelle)
diff --git a/src/mbyte.c b/src/mbyte.c
index da97b34..2a202f3 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2764,19 +2764,22 @@
int tableSize;
{
int start, mid, end; /* indices into table */
+ int entries = tableSize / sizeof(convertStruct);
start = 0;
- end = tableSize / sizeof(convertStruct);
+ end = entries;
while (start < end)
{
/* need to search further */
- mid = (end + start) /2;
+ mid = (end + start) / 2;
if (table[mid].rangeEnd < a)
start = mid + 1;
else
end = mid;
}
- if (table[start].rangeStart <= a && a <= table[start].rangeEnd
+ if (start < entries
+ && table[start].rangeStart <= a
+ && a <= table[start].rangeEnd
&& (a - table[start].rangeStart) % table[start].step == 0)
return (a + table[start].offset);
else
@@ -2791,7 +2794,7 @@
utf_fold(a)
int a;
{
- return utf_convert(a, foldCase, sizeof(foldCase));
+ return utf_convert(a, foldCase, (int)sizeof(foldCase));
}
static convertStruct toLower[] =
@@ -3119,7 +3122,7 @@
return TOUPPER_LOC(a);
/* For any other characters use the above mapping table. */
- return utf_convert(a, toUpper, sizeof(toUpper));
+ return utf_convert(a, toUpper, (int)sizeof(toUpper));
}
int
@@ -3152,7 +3155,7 @@
return TOLOWER_LOC(a);
/* For any other characters use the above mapping table. */
- return utf_convert(a, toLower, sizeof(toLower));
+ return utf_convert(a, toLower, (int)sizeof(toLower));
}
int
diff --git a/src/version.c b/src/version.c
index 6e30bf9..3cb2195 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 365,
+/**/
364,
/**/
363,
