X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_cons.c;h=a2435b46727dab90f2c1afa6a524407ac01e32a8;hb=d4c07f5246e1fe90fb79aaf44a5baccf00140221;hp=d3f15823afa1ab8682b1808fcceb196a7ff5076a;hpb=70efa832d93f63e4fe7de44b666f3b66ae87c23f;p=yaz-moved-to-github.git

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index d3f1582..a2435b4 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -1,10 +1,20 @@
 /*
- * 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: odr_cons.c,v $
- * Revision 1.8  1995-03-15 11:18:04  quinn
+ * Revision 1.11  1995-05-16 08:50:53  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.10  1995/04/18  08:15:21  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.9  1995/03/28  09:15:49  quinn
+ * Fixed bug in the printing mode
+ *
+ * Revision 1.8  1995/03/15  11:18:04  quinn
  * Fixed serious bug in odr_cons
  *
  * Revision 1.7  1995/03/10  11:44:41  quinn
@@ -55,14 +65,15 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
     	return 0;
     }
     o->stack[++(o->stackp)].lenb = o->bp;
+    o->stack[o->stackp].len_offset = odr_tell(o);
 #ifdef ODR_DEBUG
     fprintf(stderr, "[cons_begin(%d)]", o->stackp);
 #endif
     if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
     {
 	o->stack[o->stackp].lenlen = 1;
-	o->bp++;
-	o->left--;
+	if (odr_putc(o, 0) < 0)     /* dummy */
+	    return 0;
     }
     else if (o->direction == ODR_DECODE)
     {
@@ -75,6 +86,7 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
     else return 0;
 
     o->stack[o->stackp].base = o->bp;
+    o->stack[o->stackp].base_offset = odr_tell(o);
     return 1;
 }
 
@@ -93,6 +105,7 @@ int odr_constructed_more(ODR o)
 int odr_constructed_end(ODR o)
 {
     int res;
+    int pos;
 
     if (o->error)
     	return 0;
@@ -127,21 +140,19 @@ int odr_constructed_end(ODR o)
 	    o->stackp--;
 	    return 1;
     	case ODR_ENCODE:
-	    if ((res = ber_enclen(o->stack[o->stackp].lenb,
-		o->bp - o->stack[o->stackp].base,
+	    pos = odr_tell(o);
+	    odr_seek(o, ODR_S_SET, o->stack[o->stackp].len_offset);
+	    if ((res = ber_enclen(o, pos - o->stack[o->stackp].base_offset,
 		o->stack[o->stackp].lenlen, 1)) < 0)
-	    {
-	    	o->error = OSPACE;
 		return 0;
-	    }
+	    odr_seek(o, ODR_S_END, 0);
 	    if (res == 0)   /* indefinite encoding */
 	    {
 #ifdef ODR_DEBUG
 		fprintf(stderr, "[cons_end(%d): indefinite]", o->stackp);
 #endif
-	    	*(o->bp++) = 0;
-	    	*(o->bp++) = 0;
-	    	o->left -= 2;
+		if (odr_putc(o, 0) < 0 || odr_putc(o, 0) < 0)
+		    return 0;
 	    }
 #ifdef ODR_DEBUG
 	    else
@@ -151,7 +162,7 @@ int odr_constructed_end(ODR o)
 #endif
 	    o->stackp--;
 	    return 1;
-    	case ODR_PRINT: return 1;
+    	case ODR_PRINT: o->stackp--;  return 1;
     	default:
 	    o->error = OOTHER;
 	    return 0;