mirror of
https://git.freebsd.org/ports.git
synced 2025-07-04 02:49:14 -04:00
160b41eaea
Not sure this is worth a VuXML, but one will be made on request PR: ports/163476 Submitted by: Andrei Lavreniyuk <andy.lavr@gmail.com> Obtained from: http://bugs.icu-project.org/trac/ticket/8984
26 lines
955 B
C
26 lines
955 B
C
$FreeBSD$
|
|
|
|
From http://bugs.icu-project.org/trac/ticket/8984
|
|
|
|
Submitted by: Andrei Lavreniyuk <andy.lavr@gmail.com> (thanks!)
|
|
|
|
--- common/uloc.c
|
|
+++ common/uloc.c
|
|
@@ -1797,7 +1797,7 @@
|
|
int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
|
|
len -= variantLen;
|
|
if (variantLen > 0) {
|
|
- if (name[len-1] == '_') { /* delete trailing '_' */
|
|
+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
|
|
--len;
|
|
}
|
|
addKeyword = VARIANT_MAP[j].keyword;
|
|
@@ -1805,7 +1805,7 @@
|
|
break;
|
|
}
|
|
}
|
|
- if (name[len-1] == '_') { /* delete trailing '_' */
|
|
+ if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
|
|
--len;
|
|
}
|
|
}
|