/*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: ber_bit.c,v $
- * Revision 1.12 2000-02-29 13:44:55 adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.11 2000/01/31 13:15:21 adam
- * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
- * that some characters are not surrounded by spaces in resulting term.
- * ILL-code updates.
- *
- * Revision 1.10 1999/11/30 13:47:11 adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.9 1999/04/20 09:56:48 adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.8 1999/01/08 11:23:21 adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.7 1995/09/29 17:12:16 quinn
- * Smallish
- *
- * Revision 1.6 1995/09/27 15:02:54 quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.5 1995/05/16 08:50:43 quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.4 1995/04/18 08:15:13 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.3 1995/03/08 12:12:04 quinn
- * Added better error checking.
- *
- * Revision 1.2 1995/02/03 17:04:31 quinn
- * *** empty log message ***
- *
- * Revision 1.1 1995/02/02 20:38:49 quinn
- * Updates.
- *
+ * $Id: ber_bit.c,v 1.15 2003-03-11 11:03:31 adam Exp $
*
*/
#if HAVE_CONFIG_H
#include <config.h>
#endif
-#include <yaz/odr.h>
+#include "odr-priv.h"
int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
{
switch (o->direction)
{
case ODR_DECODE:
- if ((res = ber_declen(o->bp, &len)) < 0)
+ if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
{
- o->error = OPROTO;
+ odr_seterror(o, OPROTO, 4);
return 0;
}
o->bp += res;
/* primitive bitstring */
if (len < 0)
{
- o->error = OOTHER;
+ odr_seterror(o, OOTHER, 5);
return 0;
}
if (len == 0)
return 1;
if (len - 1 > ODR_BITMASK_SIZE)
{
- o->error = OOTHER;
+ odr_seterror(o, OOTHER, 6);
return 0;
}
+ if (len > odr_max(o))
+ {
+ odr_seterror(o, OOTHER, 7);
+ return 0;
+ }
o->bp++; /* silently ignore the unused-bits field */
len--;
memcpy(p->bits + p->top + 1, o->bp, len);
return 0;
return 1;
case ODR_PRINT: return 1;
- default: o->error = OOTHER; return 0;
+ default: odr_seterror(o, OOTHER, 8); return 0;
}
}