X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fber_any.c;h=6ae67d0a95683ae2b4a3d1de336fb63632f7ee01;hp=84d07a6727af00a6c9ee1babd0eaef5d87bc83e8;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hpb=fb2db0abc51ed82583dc4600fd4ff035c96f7d79

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 84d07a6..6ae67d0 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,62 +1,53 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: ber_any.c,v $
- * 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-2002, Index Data
+ * See the file LICENSE for details.
  *
+ * $Id: ber_any.c,v 1.19 2002-07-25 12:51:08 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, 1000)) <= 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)
+	    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: return 0;
+    	default: o->error = OOTHER; return 0;
     }
 }
 
 /*
  * 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;
@@ -72,15 +63,17 @@ int completeBER(unsigned char *buf, int len)
     	return (len >= ll ? ll + (b-buf) : 0);
     if (!cons)
     	return 0;    
-    while (1)
+    /* constructed - cycle through children */
+    while (len >= 2)
     {
+	if (*b == 0 && *(b + 1) == 0)
+	    break;
 	if (!(res = completeBER(b, len)))
 	    return 0;
 	b += res;
 	len -= res;
-	if (len < 2)
-	    return 0;
-	if (*b == 0 && *(b + 1) == 0)
-	    return (b - buf) + 2;
     }
+    if (len < 2)
+    	return 0;
+    return (b - buf) + 2;
 }