SRW, CQL, 2003

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

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 6492398..1280040 100644 (file)
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,58 +1,35 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: ber_any.c,v $
- * Revision 1.6  1995-03-08 12:12:02  quinn
- * Added better error checking.
- *
- * Revision 1.5  1995/02/14  20:39:54  quinn
- * Fixed bugs in completeBER and (serious one in) ber_oid.
- *
- * Revision 1.4  1995/02/14  11:54:33  quinn
- * Adjustments.
- *
- * Revision 1.3  1995/02/10  18:57:24  quinn
- * More in the way of error-checking.
- *
- * Revision 1.2  1995/02/10  15:55:28  quinn
- * Bug fixes, mostly.
- *
- * Revision 1.1  1995/02/09  15:51:45  quinn
- * Works better now.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  *
+ * $Id: ber_any.c,v 1.20 2003-01-06 08:20:27 adam Exp $
  */
-
-#include <odr.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "odr-priv.h"
 
 int ber_any(ODR o, Odr_any **p)
 {
     int res;
+    int left = o->size - (o->bp - o->buf);
 
     switch (o->direction)
     {
        case ODR_DECODE:
-           if ((res = completeBER(o->bp, o->left)) <= 0)        /* FIX THIS */
+           if ((res = completeBER(o->bp, left)) <= 0)        /* FIX THIS */
            {
                o->error = OPROTO;
                return 0;
            }
-           (*p)->buf = nalloc(o, res);
+           (*p)->buf = (unsigned char *)odr_malloc(o, res);
            memcpy((*p)->buf, o->bp, res);
            (*p)->len = (*p)->size = res;
            o->bp += res;
-           o->left -= res;
            return 1;
        case ODR_ENCODE:
-           if ((*p)->len > o->left)
-           {
-               o->error = OSPACE;
+           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;
        default: o->error = OOTHER; return 0;
     }
@@ -61,16 +38,16 @@ int ber_any(ODR o, Odr_any **p)
 /*
  * Return length of BER-package or 0.
  */
-int completeBER(unsigned char *buf, int len)
+int completeBER(const unsigned char *buf, int len)
 {
-    int res, ll, class, tag, cons;
-    unsigned char *b = buf;
+    int res, ll, zclass, tag, cons;
+    const unsigned char *b = buf;
     
     if (!len)
        return 0;
     if (!buf[0] && !buf[1])
        return 0;
-    if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
+    if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
        return 0;
     if (res > len)
        return 0;
@@ -96,5 +73,7 @@ int completeBER(unsigned char *buf, int len)
        b += res;
        len -= res;
     }
+    if (len < 2)
+       return 0;
     return (b - buf) + 2;
 }