/*
- * 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.6 1995-03-08 12:12:23 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
+ * Fixed serious stack-bug in odr_cons_begin
+ *
+ * Revision 1.6 1995/03/08 12:12:23 quinn
* Added better error checking.
*
* Revision 1.5 1995/02/10 18:57:25 quinn
if (!res || !cons)
return 0;
+ if (o->stackp == ODR_MAX_STACK - 1)
+ {
+ o->error = OSTACK;
+ 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)
{
else return 0;
o->stack[o->stackp].base = o->bp;
+ o->stack[o->stackp].base_offset = odr_tell(o);
return 1;
}
int odr_constructed_end(ODR o)
{
int res;
+ int pos;
if (o->error)
return 0;
if (*o->bp++ == 0 && *(o->bp++) == 0)
{
o->left -= 2;
+ o->stackp--;
return 1;
}
else
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 */
{
- *(o->bp++) = *(o->bp++) = 0;
- o->left--;
+#ifdef ODR_DEBUG
+ fprintf(stderr, "[cons_end(%d): indefinite]", o->stackp);
+#endif
+ if (odr_putc(o, 0) < 0 || odr_putc(o, 0) < 0)
+ return 0;
+ }
+#ifdef ODR_DEBUG
+ else
+ {
+ fprintf(stderr, "[cons_end(%d): definite]", o->stackp);
}
+#endif
o->stackp--;
return 1;
- case ODR_PRINT: return 1;
+ case ODR_PRINT: o->stackp--; return 1;
default:
o->error = OOTHER;
return 0;