X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oct.c;h=a332846a84584c49ed700e94d71b10994f51fe7c;hb=c80275992d29b4815dd25d9203e094ae2880f1ae;hp=4f04960fbeaaef173ded76bee3afdb56ba62f4e7;hpb=569f86b4615c2731727be2a0ff898d36f9725819;p=yaz-moved-to-github.git

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 4f04960..a332846 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.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: ber_oct.c,v 1.19 2002-07-25 12:51:08 adam Exp $
+ * $Id: ber_oct.c,v 1.21 2003-03-11 11:03:31 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -20,9 +20,9 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = ber_declen(o->bp, &len)) < 0)
+	    if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
 	    {
-	    	o->error = OPROTO;
+                odr_seterror(o, OPROTO, 14);
 	    	return 0;
 	    }
 	    o->bp += res;
@@ -37,9 +37,14 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    /* primitive octetstring */
 	    if (len < 0)
 	    {
-	    	o->error = OOTHER;
+                odr_seterror(o, OOTHER, 15);
 	    	return 0;
 	    }
+            if (len > odr_max(o))
+            {
+                odr_seterror(o, OOTHER, 16);
+                return 0;
+            }
 	    if (len + 1 > p->size - p->len)
 	    {
 	    	c = (unsigned char *)odr_malloc(o, p->size += len + 1);
@@ -65,6 +70,6 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    	return 0;
 	    return 1;
     	case ODR_PRINT: return 1;
-    	default: o->error = OOTHER; return 0;
+    	default: odr_seterror(o, OOTHER, 17); return 0;
     }
 }