/*
- * Copyright (c) 1995-2002, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: dumpber.c,v 1.13 2002-07-25 12:51:08 adam Exp $
+ * $Id: dumpber.c,v 1.16 2003-04-24 12:48:47 adam Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
return 0;
if (!buf[0] && !buf[1])
return 0;
- if ((res = ber_dectag((unsigned char*)b, &zclass, &tag, &cons)) <= 0)
+ if ((res = ber_dectag((unsigned char*)b, &zclass, &tag, &cons, len)) <= 0)
return 0;
if (res > len)
{
"GRAPHICSTRING", "VISIBLESTRING", "GENERALSTRING", "[UNIV 28]"
};
- if (tag < 28)
+ if (tag >= 0 && tag < 28)
fprintf(f, "%s", nl[tag]);
else
fprintf(f, "[UNIV %d]", tag);
taglen = res;
len -= res;
bp = b;
- if ((res = ber_declen((unsigned char*)b, &ll)) <= 0)
+ if ((res = ber_declen((unsigned char*)b, &ll, len)) <= 0)
{
- fprintf(f, "bad length\n");
- return 0;
- }
- if (res > len)
- {
- fprintf(f, "Unexpected end of buffer\n");
+ fprintf(f, "\n%*sBad length\n", level*4+5, "");
return 0;
}
lenlen = res;
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)
+ if (ll < 0 || ll > len)
{
- fprintf(f, "Bad length on primitive type.\n");
+ fprintf(f, "%*sBad length on primitive type. ll=%d len=%d\n",
+ level*4+5, "", ll, len);
return 0;
}
return ll + (b - buf);
}
if (ll >= 0)
+ {
+ if (ll > len)
+ {
+ fprintf(f, "%*sBad length of constructed type ll=%d len=%d.\n",
+ level*4+5, "", ll, len);
+ return 0;
+ }
len = ll;
+ }
/* constructed - cycle through children */
while ((ll == -1 && len >= 2) || (ll >= 0 && len))
{
break;
if (!(res = do_dumpBER(f, b, len, level + 1, offset + (b - buf))))
{
- fprintf(f, "Dump of content element failed.\n");
+ fprintf(f, "%*sDump of content element failed.\n", level*4+5, "");
return 0;
}
b += res;
len -= res;
+ if (len < 0)
+ {
+ fprintf(f, "%*sBad length\n", level*4+5, "");
+ return 0;
+ }
}
if (ll == -1)
{
if (len < 2)
{
- fprintf(f, "Buffer too short in indefinite lenght.\n");
+ fprintf(f, "%*sBuffer too short in indefinite length.\n",
+ level*4+5, "");
return 0;
}
return (b - buf) + 2;