X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oct.c;h=a332846a84584c49ed700e94d71b10994f51fe7c;hb=a54c709b3e2feff5762bfa7dfa8ee653b429d369;hp=41c568be99e54b640f3c75c06d61c9cffa047869;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git diff --git a/odr/ber_oct.c b/odr/ber_oct.c index 41c568b..a332846 100644 --- a/odr/ber_oct.c +++ b/odr/ber_oct.c @@ -1,86 +1,75 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995-2003, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: ber_oct.c,v $ - * Revision 1.1 1995-02-02 16:21:52 quinn - * First kick. - * + * $Id: ber_oct.c,v 1.21 2003-03-11 11:03:31 adam Exp $ */ +#if HAVE_CONFIG_H +#include +#endif -#include - -static int more_chunks(ODR o, unsigned char *base, int len) -{ - if (!len) - return 0; - if (len < 0) /* indefinite length */ - { - if (*o->bp == 0 && *(o->bp + 1) == 0) - { - o->bp += 2; - o->left -= 2; - return 0; - } - else - return 1; - } - else - return o->bp - base < len; -} +#include "odr-priv.h" -int ber_octetstring(ODR o, ODR_OCT *p, int cons) +int ber_octetstring(ODR o, Odr_oct *p, int cons) { int res, len; - unsigned char *base, *c; + const unsigned char *base; + unsigned char *c; switch (o->direction) { case ODR_DECODE: - if ((res = ber_declen(o->bp, &len)) < 0) + if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0) + { + odr_seterror(o, OPROTO, 14); return 0; + } o->bp += res; - o->left -= res; if (cons) /* fetch component strings */ { base = o->bp; - while (more_chunks(o, base, len)) - if (!odr_octetstring(o, &p, 0)) + while (odp_more_chunks(o, base, len)) + if (!odr_octetstring(o, &p, 0, 0)) return 0; return 1; } /* primitive octetstring */ if (len < 0) + { + odr_seterror(o, OOTHER, 15); return 0; - if (len == 0) - return 1; - if (len > p->size - p->len) + } + if (len > odr_max(o)) + { + odr_seterror(o, OOTHER, 16); + return 0; + } + if (len + 1 > p->size - p->len) { - c = nalloc(o, p->size += len); + c = (unsigned char *)odr_malloc(o, p->size += len + 1); if (p->len) memcpy(c, p->buf, p->len); p->buf = c; } - memcpy(p->buf + p->len, o->bp, len); + if (len) + memcpy(p->buf + p->len, o->bp, len); p->len += len; o->bp += len; - o->left -= len; + /* the final null is really not part of the buffer, but */ + /* it helps somes applications that assumes C strings */ + if (len) + p->buf[p->len] = '\0'; return 1; case ODR_ENCODE: - if ((res = ber_enclen(o->bp, p->len, 5, 0)) < 0) + if ((res = ber_enclen(o, p->len, 5, 0)) < 0) return 0; - o->bp += res; - o->left -= res; if (p->len == 0) return 1; - if (p->len > o->left) + if (odr_write(o, p->buf, p->len) < 0) return 0; - memcpy(o->bp, p->buf, p->len); - o->bp += p->len; - o->left -= p->len; return 1; case ODR_PRINT: return 1; - default: return 0; + default: odr_seterror(o, OOTHER, 17); return 0; } }