X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=00388cd764f0dfe62fd2bd4de6baa9669e9f4f95;hb=006c3df264a95c03bfc557b2004595fc6cc3ee14;hp=cad4e1914a494594176939eea974843f579eedc6;hpb=549074d1394b37eb04b612c0f2f16fe1361d6243;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index cad4e19..00388cd 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,36 +1,14 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: ber_any.c,v $
- * Revision 1.8  1995-04-17 09:37:42  quinn
- * *** empty log message ***
- *
- * Revision 1.7  1995/03/17  10:17:39  quinn
- * Added memory management.
- *
- * 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.24 2003-03-11 11:03:31 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 int ber_any(ODR o, Odr_any **p)
 {
@@ -39,50 +17,43 @@ int ber_any(ODR o, Odr_any **p)
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = completeBER(o->bp, o->left)) <= 0)        /* FIX THIS */
+	    if ((res = completeBER(o->bp, odr_max(o))) <= 0)        /* FIX THIS */
 	    {
-	    	o->error = OPROTO;
+                odr_seterror(o, OPROTO, 2);
 	    	return 0;
 	    }
-	    (*p)->buf = odr_malloc(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;
+    	default: odr_seterror(o, OOTHER, 3); 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, len)) <= 0)
     	return 0;
     if (res > len)
     	return 0;
     b += res;
     len -= res;
-    if ((res = ber_declen(b, &ll)) <= 0)
+    if ((res = ber_declen(b, &ll, len)) <= 0)
     	return 0;
     if (res > len)
     	return 0;