From f781ff13f9443a58e5eae30182e508df9dfe9555 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 24 Apr 2003 12:48:47 +0000 Subject: [PATCH] Work on bug 24 --- odr/dumpber.c | 4 ++-- odr/odr_bit.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/odr/dumpber.c b/odr/dumpber.c index fcf2e3d..b332f9a 100644 --- a/odr/dumpber.c +++ b/odr/dumpber.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: dumpber.c,v 1.15 2003-03-11 11:03:31 adam Exp $ + * $Id: dumpber.c,v 1.16 2003-04-24 12:48:47 adam Exp $ */ #if HAVE_CONFIG_H #include @@ -66,7 +66,7 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset) fprintf(f, " len=%d", ll); else fprintf(f, " len=?"); - fprintf(f, " tl=%d, ll=%d\n", taglen, lenlen); + fprintf(f, " tl=%d, ll=%d cons=%d\n", taglen, lenlen, cons); if (!cons) { if (ll < 0 || ll > len) diff --git a/odr/odr_bit.c b/odr/odr_bit.c index 0a1426f..5cae833 100644 --- a/odr/odr_bit.c +++ b/odr/odr_bit.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: odr_bit.c,v 1.16 2003-01-06 08:20:27 adam Exp $ + * $Id: odr_bit.c,v 1.17 2003-04-24 12:48:47 adam Exp $ */ #if HAVE_CONFIG_H #include @@ -43,5 +43,12 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name) memset((*p)->bits, 0, ODR_BITMASK_SIZE); (*p)->top = -1; } +#if 0 + /* ignoring the cons helps with at least one target. + * http://bugzilla.indexdata.dk/cgi-bin/bugzilla/show_bug.cgi?id=24 + */ + return ber_bitstring(o, *p, 0); +#else return ber_bitstring(o, *p, cons); +#endif } -- 1.7.10.4