X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_any.c;h=7243e3d050d7e4e56509a81bafdc676eb32b5f63;hp=8899dde4cbea72ffb1aad357e2e3602a17d35ab2;hb=05193e78a2553c93a61da19a39e1276b1a509bac;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/src/ber_any.c b/src/ber_any.c
index 8899dde..7243e3d 100644
--- a/src/ber_any.c
+++ b/src/ber_any.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_any.c,v 1.4 2005-06-25 15:46:03 adam Exp $
  */
 
-/** 
+/**
  * \file ber_any.c
  * \brief Implements BER ANY encoding and decoding.
  *
@@ -23,19 +21,19 @@
 int ber_any(ODR o, Odr_any **p)
 {
     int res;
-    
+
     switch (o->direction)
     {
     case ODR_DECODE:
-        if ((res = completeBER(o->bp, odr_max(o))) <= 0)        /* FIX THIS */
+        if ((res = completeBER(o->op->bp, odr_max(o))) <= 0)        /* FIX THIS */
         {
             odr_seterror(o, OPROTO, 2);
             return 0;
         }
-        (*p)->buf = (unsigned char *)odr_malloc(o, res);
-        memcpy((*p)->buf, o->bp, res);
-        (*p)->len = (*p)->size = res;
-        o->bp += res;
+        (*p)->buf = (char *)odr_malloc(o, res);
+        memcpy((*p)->buf, o->op->bp, res);
+        (*p)->len = res;
+        o->op->bp += res;
         return 1;
     case ODR_ENCODE:
         if (odr_write(o, (*p)->buf, (*p)->len) < 0)
@@ -47,23 +45,17 @@ int ber_any(ODR o, Odr_any **p)
 
 #define BER_ANY_DEBUG 0
 
-/*
- * Return length of BER-package or 0.
- */
-int completeBER_n(const unsigned char *buf, int len, int level)
+int completeBER_n(const 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)
+    const char *b = buf;
+
+    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;
@@ -71,11 +63,6 @@ int completeBER_n(const unsigned char *buf, int len, int level)
         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
     b += res;
     len -= res;
     assert (len >= 0);
@@ -83,54 +70,36 @@ int completeBER_n(const unsigned char *buf, int len, int level)
     if (res == -2)
     {
 #if BER_ANY_DEBUG
-        if (bad)
-            yaz_log(LOG_LOG, "<<<<<<<<< return1 lev=%d res=%d", level, res);
+        yaz_log(YLOG_LOG, "<<<<<<<<< return1 lev=%d res=%d", level, res);
 #endif
         return -1;  /* error */
     }
-    if (res == -1)  
+    if (res == -1)
     {
 #if BER_ANY_DEBUG
-        if (bad)
-            yaz_log(LOG_LOG, "<<<<<<<<< return3 lev=%d res=-1", level);
+        yaz_log(YLOG_LOG, "<<<<<<<<< return2 lev=%d res=%d", level, res);
 #endif
         return 0;    /* incomplete length */
     }
-    if (ll > 5000000)
-    {
-#if BER_ANY_DEBUG
-        if (bad)
-            yaz_log(LOG_LOG, "<<<<<<<<< return2 lev=%d len=%d res=%d ll=%d",
-                    level, len, res, ll);
-#endif
-        return -1;  /* error */
-    }
-#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",
+            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",
+        yaz_log(YLOG_LOG, "<<<<<<<<< return6 lev=%d ll=%d len=%d res=%d",
                 level, ll, len, res);
 #endif
         return -1;   /* error */
@@ -140,10 +109,9 @@ int completeBER_n(const unsigned char *buf, int len, int level)
     {
         if (b[0] == 0 && b[1] == 0)
             break;
-        if (!(res = completeBER_n(b, len, level+1)))
-            return 0;
-        if (res == -1)
-            return -1;
+        res = completeBER_n(b, len, level+1);
+        if (res <= 0)
+            return res;
         b += res;
         len -= res;
     }
@@ -152,9 +120,12 @@ int completeBER_n(const unsigned char *buf, int len, int level)
     return (b - buf) + 2;
 }
 
-int completeBER(const unsigned char *buf, int len)
+int completeBER(const 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 res;
@@ -162,6 +133,7 @@ int completeBER(const unsigned char *buf, int len)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab