projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
recvmmsg: add time64 syscall support, decouple 32-bit time_t
[musl]
/
src
/
locale
/
__mo_lookup.c
diff --git
a/src/locale/__mo_lookup.c
b/src/locale/__mo_lookup.c
index
8112d91
..
d18ab77
100644
(file)
--- a/
src/locale/__mo_lookup.c
+++ b/
src/locale/__mo_lookup.c
@@
-18,12
+18,16
@@
const char *__mo_lookup(const void *p, size_t size, const char *s)
o/=4;
t/=4;
for (;;) {
o/=4;
t/=4;
for (;;) {
+ uint32_t ol = swapc(mo[o+2*(b+n/2)], sw);
uint32_t os = swapc(mo[o+2*(b+n/2)+1], sw);
uint32_t os = swapc(mo[o+2*(b+n/2)+1], sw);
- if (os >= size) return 0;
+ if (os >= size || ol >= size-os || ((char *)p)[os+ol])
+ return 0;
int sign = strcmp(s, (char *)p + os);
if (!sign) {
int sign = strcmp(s, (char *)p + os);
if (!sign) {
+ uint32_t tl = swapc(mo[t+2*(b+n/2)], sw);
uint32_t ts = swapc(mo[t+2*(b+n/2)+1], sw);
uint32_t ts = swapc(mo[t+2*(b+n/2)+1], sw);
- if (ts >= size) return 0;
+ if (ts >= size || tl >= size-ts || ((char *)p)[ts+tl])
+ return 0;
return (char *)p + ts;
}
else if (n == 1) return 0;
return (char *)p + ts;
}
else if (n == 1) return 0;