projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dn_expand pointer following
[oweals/musl.git]
/
src
/
network
/
dn_expand.c
diff --git
a/src/network/dn_expand.c
b/src/network/dn_expand.c
index 72a80e82a6f98273c33573221315f62b1daa5903..96adf37e4a9f3bd54fb29500726db7fbc728d73e 100644
(file)
--- a/
src/network/dn_expand.c
+++ b/
src/network/dn_expand.c
@@
-6,21
+6,23
@@
int __dn_expand(const unsigned char *base, const unsigned char *end, const unsig
const unsigned char *p = src;
int len = -1, j;
if (space > 256) space = 256;
const unsigned char *p = src;
int len = -1, j;
if (space > 256) space = 256;
- if (p==end) return -1;
+ if (p==end
|| !*p
) return -1;
for (;;) {
if (*p & 0xc0) {
if (p+1==end) return -1;
for (;;) {
if (*p & 0xc0) {
if (p+1==end) return -1;
- j = (
p[0]&1
) | p[1];
+ j = (
(p[0] & 0x3f) << 8
) | p[1];
if (len < 0) len = p+2-src;
if (j >= end-base) return -1;
p = base+j;
} else if (*p) {
j = *p+1;
if (len < 0) len = p+2-src;
if (j >= end-base) return -1;
p = base+j;
} else if (*p) {
j = *p+1;
- if (len < 0) len = p+1-src;
if (j>=end-p || j>space) return -1;
if (j>=end-p || j>space) return -1;
- while (--j) *dest++ = *
p++
;
+ while (--j) *dest++ = *
++p
;
*dest++ = *++p ? '.' : 0;
*dest++ = *++p ? '.' : 0;
- } else return len;
+ } else {
+ if (len < 0) len = p+1-src;
+ return len;
+ }
}
}
}
}