-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
- *
- * $Id: ber_any.c,v 1.2 2004-10-15 00:18:59 adam Exp $
*/
-/**
+/**
* \file ber_any.c
* \brief Implements BER ANY encoding and decoding.
*
int ber_any(ODR o, Odr_any **p)
{
int res;
-
+
switch (o->direction)
{
case ODR_DECODE:
#define BER_ANY_DEBUG 0
-/*
- * Return length of BER-package or 0.
- */
int completeBER_n(const unsigned char *buf, int len, int level)
{
int res, ll, zclass, tag, cons;
const unsigned char *b = buf;
- int bad = 0;
-
- if (len > 5000000 || level > 1000)
+
+ if (level > 1000)
{
- bad = 1;
#if BER_ANY_DEBUG
- yaz_log(LOG_LOG, "completeBER lev=%d len=%d", level, len);
+ yaz_log(YLOG_LOG, "completeBER lev=%d len=%d", level, len);
#endif
- if (level > 1000)
- return -2;
+ return -2;
}
if (len < 2)
- return 0;
+ return 0;
if (!buf[0] && !buf[1])
- return -2;
+ return -2;
if ((res = ber_dectag(b, &zclass, &tag, &cons, len)) <= 0)
- return 0;
-#if 0
-/* removed, since ber_dectag never reads that far .. */
- if (res > len)
- return 0;
-#endif
+ return 0;
b += res;
len -= res;
assert (len >= 0);
if (res == -2)
{
#if BER_ANY_DEBUG
- if (bad)
- yaz_log(LOG_LOG, "<<<<<<<<< return1 lev=%d res=%d", level, res);
-#endif
- return -1; /* error */
- }
- if (res == -1)
- {
-#if BER_ANY_DEBUG
- if (bad)
- yaz_log(LOG_LOG, "<<<<<<<<< return3 lev=%d res=-1", level);
+ yaz_log(YLOG_LOG, "<<<<<<<<< return1 lev=%d res=%d", level, res);
#endif
- return 0; /* incomplete length */
+ return -1; /* error */
}
- if (ll > 5000000)
+ if (res == -1)
{
#if BER_ANY_DEBUG
- if (bad)
- yaz_log(LOG_LOG, "<<<<<<<<< return2 lev=%d len=%d res=%d ll=%d",
- level, len, res, ll);
+ yaz_log(YLOG_LOG, "<<<<<<<<< return2 lev=%d res=%d", level, res);
#endif
- return -1; /* error */
+ return 0; /* incomplete length */
}
-#if 0
-/* no longer necessary, since ber_declen never reads that far (returns -1) */
- if (res > len)
- {
- if (bad)
- yaz_log(LOG_LOG, "<<<<<<<<< return4 lev=%d res=%d len=%d",
- level, res, len);
- return 0;
- }
-#endif
b += res;
len -= res;
if (ll >= 0)
{ /* definite length */
+ if (len < ll)
+ {
#if BER_ANY_DEBUG
- if (bad && len < ll)
- yaz_log(LOG_LOG, "<<<<<<<<< return5 lev=%d len=%d ll=%d",
- level, len, ll);
+ yaz_log(YLOG_LOG, "<<<<<<<<< return5 lev=%d len=%d ll=%d",
+ level, len, ll);
#endif
- return (len >= ll ? ll + (b-buf) : 0);
+ return 0;
+ }
+ return ll + (b-buf);
}
/* indefinite length */
if (!cons)
{ /* if primitive, it's an error */
#if BER_ANY_DEBUG
- yaz_log(LOG_LOG, "<<<<<<<<< return6 lev=%d ll=%d len=%d res=%d",
- level, ll, len, res);
+ yaz_log(YLOG_LOG, "<<<<<<<<< return6 lev=%d ll=%d len=%d res=%d",
+ level, ll, len, res);
#endif
- return -1; /* error */
+ return -1; /* error */
}
/* constructed - cycle through children */
while (len >= 2)
{
- if (b[0] == 0 && b[1] == 0)
- break;
- if (!(res = completeBER_n(b, len, level+1)))
- return 0;
- if (res == -1)
- return -1;
- b += res;
- len -= res;
+ if (b[0] == 0 && b[1] == 0)
+ break;
+ res = completeBER_n(b, len, level+1);
+ if (res <= 0)
+ return res;
+ b += res;
+ len -= res;
}
if (len < 2)
- return 0;
+ return 0;
return (b - buf) + 2;
}
int completeBER(const unsigned char *buf, int len)
{
int res = completeBER_n(buf, len, 0);
+#if BER_ANY_DEBUG
+ yaz_log(YLOG_LOG, "completeBER len=%d res=%d", len, res);
+#endif
if (res < 0)
- return len;
+ return len;
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+