diff options
Diffstat (limited to 'src/network/dn_expand.c')
| -rw-r--r-- | src/network/dn_expand.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/network/dn_expand.c b/src/network/dn_expand.c index 01b449bb..72a80e82 100644 --- a/src/network/dn_expand.c +++ b/src/network/dn_expand.c @@ -1,28 +1,27 @@ #include <resolv.h> -#include <string.h> +#include "libc.h" -#define BITOP(a,b,op) \ - ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a)))) - -int dn_expand(unsigned char *b, unsigned char *pz, unsigned char *p, unsigned char *s, int outlen) +int __dn_expand(const unsigned char *base, const unsigned char *end, const unsigned char *src, char *dest, int space) { - /* Remember jump destinations to detect loops and abort */ - size_t seen[512/8/sizeof(size_t)] = { 0 }; - unsigned char *sz = s + outlen; - if (pz-b > 512) return -1; + const unsigned char *p = src; + int len = -1, j; + if (space > 256) space = 256; + if (p==end) return -1; for (;;) { - if (p>=pz) return -1; - else if (*p&0xc0) { - int j = (p[0]&1) | p[1]; - if (BITOP(seen, j, &)) return -1; - BITOP(seen, j, |=); - p = b + j; + if (*p & 0xc0) { + if (p+1==end) return -1; + j = (p[0]&1) | p[1]; + if (len < 0) len = p+2-src; + if (j >= end-base) return -1; + p = base+j; } else if (*p) { - if (p+*p+1>=pz || s+*p>=sz) return -1; - memcpy(s, p+1, *p); - s += *p+1; - p += *p+1; - s[-1] = *p ? '.' : 0; - } else return 0; + j = *p+1; + if (len < 0) len = p+1-src; + if (j>=end-p || j>space) return -1; + while (--j) *dest++ = *p++; + *dest++ = *++p ? '.' : 0; + } else return len; } } + +weak_alias(__dn_expand, dn_expand); |