X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=2e9a3ce264cd328b8b3958148389e882089fe53f;hb=10eb94e29af1a3899279354253ecc01e8298659f;hp=35c0a83302da5f1526a56a44a5e9e1e235693518;hpb=6c126e94642b41867fb323ff39fded733757a11e;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 35c0a83..2e9a3ce 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.5  1995-02-14 20:39:54  quinn
+ * 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
@@ -30,9 +36,12 @@ int ber_any(ODR o, Odr_any **p)
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = completeBER(o->bp, 1000)) <= 0)        /* FIX THIS */
+	    if ((res = completeBER(o->bp, o->left)) <= 0)        /* FIX THIS */
+	    {
+	    	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;
@@ -40,12 +49,15 @@ int ber_any(ODR o, Odr_any **p)
 	    return 1;
     	case ODR_ENCODE:
 	    if ((*p)->len > o->left)
+	    {
+	    	o->error = OSPACE;
 	    	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;
     }
 }