X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=odr%2Fdumpber.c;h=b332f9ab9aaa31c7c7e57f825909cbb2247e1dfd;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hp=1af624a17138224c900ca3c077207f59bd0ce11f;hpb=2da6a9a95d6007eca27f715dbf77bea323cb9069;p=yaz-moved-to-github.git

diff --git a/odr/dumpber.c b/odr/dumpber.c
index 1af624a..b332f9a 100644
--- a/odr/dumpber.c
+++ b/odr/dumpber.c
@@ -1,52 +1,27 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: dumpber.c,v $
- * Revision 1.9  1998-01-14 09:53:26  quinn
- * Added a bit more info to dump.
- *
- * Revision 1.8  1997/05/14 06:53:57  adam
- * C++ support.
- *
- * Revision 1.7  1996/03/08 14:38:41  quinn
- * Fixed output.
- *
- * Revision 1.6  1996/01/19  15:41:34  quinn
- * dumpber was ignoring the file argument.
- *
- * Revision 1.5  1995/10/18  16:12:55  quinn
- * Better diagnostics. Added special case in NULL to handle WAIS server.
- *
- * Revision 1.4  1995/09/29  17:12:21  quinn
- * Smallish
- *
- * Revision 1.3  1995/09/27  15:02:57  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.2  1995/06/27  13:20:51  quinn
- * Fixed sign-clash. Non-fatal warning
- *
- * Revision 1.1  1995/06/19  12:38:45  quinn
- * Added BER dumper.
- *
- *
+ * $Id: dumpber.c,v 1.16 2003-04-24 12:48:47 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
 #include <stdio.h>
+#include "odr-priv.h"
 
-static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
+static int do_dumpBER(FILE *f, const char *buf, int len, int level, int offset)
 {
     int res, ll, zclass, tag, cons, lenlen, taglen;
-    char *b = buf, *bp = buf;
+    const char *b = buf, *bp = buf;
     
     if (!len)
     	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)
     {
@@ -66,7 +41,7 @@ static int do_dumpBER(FILE *f, 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);
@@ -79,14 +54,9 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
     taglen = res;
     len -= res;
     bp = b;
-    if ((res = ber_declen((unsigned char*)b, &ll)) <= 0)
-    {
-    	fprintf(f, "bad length\n");
-    	return 0;
-    }
-    if (res > len)
+    if ((res = ber_declen((unsigned char*)b, &ll, len)) <= 0)
     {
-    	fprintf(f, "Unexpected end of buffer\n");
+    	fprintf(f, "\n%*sBad length\n", level*4+5, "");
     	return 0;
     }
     lenlen = res;
@@ -96,18 +66,27 @@ static int do_dumpBER(FILE *f, 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))
     {
@@ -115,17 +94,23 @@ static int do_dumpBER(FILE *f, 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;
@@ -133,7 +118,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
     return b - buf;
 }
 
-int odr_dumpBER(FILE *f, char *buf, int len)
+int odr_dumpBER(FILE *f, const char *buf, int len)
 {
     return do_dumpBER(f, buf, len, 0, 0);
 }