X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=51dc7f3e5baded2995c244e5176571548d01810e;hb=2d093b88ca5c238b6394c1254078841b19f724ff;hp=6492398d4c2fb9995353df3b42152db413c4e7bf;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 6492398..51dc7f3 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.6  1995-03-08 12:12:02  quinn
+ * Revision 1.10  1995-05-16 08:50:42  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.9  1995/04/18  08:15:12  quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * 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
@@ -38,21 +51,15 @@ int ber_any(ODR o, Odr_any **p)
 	    	o->error = OPROTO;
 	    	return 0;
 	    }
-	    (*p)->buf = nalloc(o, res);
+	    (*p)->buf = 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;
     }
@@ -96,5 +103,7 @@ int completeBER(unsigned char *buf, int len)
 	b += res;
 	len -= res;
     }
+    if (len < 2)
+    	return 0;
     return (b - buf) + 2;
 }