X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fdumpber.c;h=b332f9ab9aaa31c7c7e57f825909cbb2247e1dfd;hb=8bccad6217bd2ba078106a531a9e73e7f3aae4a9;hp=1fbdecfd756b0a2194d28d1786382020ccef5f72;hpb=569f86b4615c2731727be2a0ff898d36f9725819;p=yaz-moved-to-github.git

diff --git a/odr/dumpber.c b/odr/dumpber.c
index 1fbdecf..b332f9a 100644
--- a/odr/dumpber.c
+++ b/odr/dumpber.c
@@ -1,9 +1,9 @@
 /*
- * 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>
@@ -21,7 +21,7 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
     	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)
     {
@@ -41,7 +41,7 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
 	    "GRAPHICSTRING", "VISIBLESTRING", "GENERALSTRING", "[UNIV 28]"
 	};
 
-	if (tag < 28)
+	if (tag >= 0 && tag < 28)
 	    fprintf(f, "%s", nl[tag]);
 	else
 	    fprintf(f, "[UNIV %d]", tag);
@@ -54,14 +54,9 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
     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;
@@ -71,18 +66,27 @@ 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)
+    	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))
     {
@@ -90,17 +94,23 @@ static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
 	    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;