SRW, CQL, 2003

[yaz-moved-to-github.git] / odr / ber_oct.c

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 9b5a2fd..e2ba432 100644 (file)
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,70 +1,70 @@
 /*
- * 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.2  1995-02-02 20:38:50  quinn
- * Updates.
- *
- * Revision 1.1  1995/02/02  16:21:52  quinn
- * First kick.
- *
+ * $Id: ber_oct.c,v 1.20 2003-01-06 08:20:27 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#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)
+           {
+               o->error = OPROTO;
                return 0;
+           }
            o->bp += res;
-           o->left -= res;
            if (cons)       /* fetch component strings */
            {
                base = o->bp;
                while (odp_more_chunks(o, base, len))
-                   if (!odr_octetstring(o, &p, 0))
+                   if (!odr_octetstring(o, &p, 0, 0))
                        return 0;
                return 1;
            }
            /* primitive octetstring */
            if (len < 0)
+           {
+               o->error = OOTHER;
                return 0;
-           if (len == 0)
-               return 1;
-           if (len > p->size - p->len)
+           }
+           if (len + 1 > p->size - p->len)
            {
-               c = nalloc(o, p->size += len + 1);
+               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: o->error = OOTHER; return 0;
     }
 }