X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_any.c;h=c3e094716ec8fd6262ad6d8c7befb6f1cec51497;hb=a6d84a7dae6b0dc41228c301069bb14fb26bd38e;hp=35c0a83302da5f1526a56a44a5e9e1e235693518;hpb=6c126e94642b41867fb323ff39fded733757a11e;p=yaz-moved-to-github.git

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 35c0a83..c3e0947 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,67 +1,96 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: ber_any.c,v $
- * Revision 1.5  1995-02-14 20:39:54  quinn
- * Fixed bugs in completeBER and (serious one in) ber_oid.
- *
- * Revision 1.4  1995/02/14  11:54:33  quinn
- * Adjustments.
- *
- * Revision 1.3  1995/02/10  18:57:24  quinn
- * More in the way of error-checking.
- *
- * Revision 1.2  1995/02/10  15:55:28  quinn
- * Bug fixes, mostly.
- *
- * Revision 1.1  1995/02/09  15:51:45  quinn
- * Works better now.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  *
+ * $Id: ber_any.c,v 1.22 2003-02-14 18:49:23 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <ctype.h>
 
-#include <odr.h>
+#include "odr-priv.h"
 
 int ber_any(ODR o, Odr_any **p)
 {
     int res;
+    int left = o->size - (o->bp - o->buf);
 
     switch (o->direction)
     {
     	case ODR_DECODE:
-	    if ((res = completeBER(o->bp, 1000)) <= 0)        /* FIX THIS */
+	    if ((res = completeBER(o->bp, left)) <= 0)        /* FIX THIS */
+	    {
+	    	o->error = OPROTO;
 	    	return 0;
-	    (*p)->buf = nalloc(o, res);
+	    }
+	    (*p)->buf = (unsigned char *)odr_malloc(o, res);
 	    memcpy((*p)->buf, o->bp, res);
 	    (*p)->len = (*p)->size = res;
 	    o->bp += res;
-	    o->left -= res;
 	    return 1;
     	case ODR_ENCODE:
-	    if ((*p)->len > o->left)
+	    if (odr_write(o, (*p)->buf, (*p)->len) < 0)
 	    	return 0;
-	    memcpy(o->bp , (*p)->buf, (*p)->len);
-	    o->bp += (*p)->len;
-	    o->left -= (*p)->len;
 	    return 1;
-    	default: return 0;
+    	default: o->error = OOTHER; return 0;
     }
 }
 
 /*
  * Return length of BER-package or 0.
  */
-int completeBER(unsigned char *buf, int len)
+int completeBER(const unsigned char *buf, int len)
 {
-    int res, ll, class, tag, cons;
-    unsigned char *b = buf;
+    int res, ll, zclass, tag, cons;
+    const unsigned char *b = buf;
     
     if (!len)
     	return 0;
     if (!buf[0] && !buf[1])
     	return 0;
-    if ((res = ber_dectag(b, &class, &tag, &cons)) <= 0)
+    if (len > 5 && buf[0] >= 0x20 && buf[0] < 0x7f
+		&& buf[1] >= 0x20 && buf[1] < 0x7f
+		&& buf[2] >= 0x20 && buf[2] < 0x7f)
+    {
+        /* deal with HTTP request/response */
+	int i = 2, content_len = 0;
+
+        while (i <= len-4)
+        {
+            if (buf[i] == '\r' && buf[i+1] == '\n')
+            {
+                i += 2;
+                if (buf[i] == '\r' && buf[i+1] == '\n')
+                {
+                    /* i += 2 seems not to work with GCC -O2 .. 
+                       so i+2 is used instead .. */
+                    if (len >= (i+2)+ content_len)
+                        return (i+2)+ content_len;
+                    break;
+                }
+                if (i < len-18)
+                {
+                    if (!memcmp(buf+i, "Content-Length:", 15))
+                    {
+                        i+= 15;
+                        if (buf[i] == ' ')
+                            i++;
+                        content_len = 0;
+                        while (i <= len-4 && isdigit(buf[i]))
+                            content_len = content_len*10 + (buf[i++] - '0');
+                        if (content_len < 0) /* prevent negative offsets */
+                            content_len = 0;
+                    }
+                }
+            }
+            else
+                i++;
+        }
+        return 0;
+    }
+    /* BER from now on .. */
+    if ((res = ber_dectag(b, &zclass, &tag, &cons)) <= 0)
     	return 0;
     if (res > len)
     	return 0;
@@ -87,5 +116,7 @@ int completeBER(unsigned char *buf, int len)
 	b += res;
 	len -= res;
     }
+    if (len < 2)
+    	return 0;
     return (b - buf) + 2;
 }