Changeset 99f3e5493956c0cc4df7416df2da23cc7d4fd55d

Timestamp:

11/07/02 17:54:39 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1036688079 +0000

git-parent:

[85071f3419dec4837538a25f0ab8853cd6ddf531]

git-author:

Gildas Bazin <gbazin@videolan.org> 1036688079 +0000

Message:

* modules/access/http.c: don't crash, but complain on non http/1.x streams.

Files:

• modules/access/http.c (modified) (5 diffs)

modules/access/http.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-5 2002/10/07 21:58:40 massiot
+6 2002/11/07 16:54:39 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -97 +97 @@
-    char                psz_buffer[256];
-    byte_t *            psz_parser;
-
+, i_size
-    char *              psz_return_alpha;
-
@@ -161 +161 @@
-
-    /* get the returncode */
-input_Peek( p_input, &psz_parser, MAX_LINE 
+(i_size = input_Peek( p_input, &psz_parser, MAX_LINE )
-    {
-        msg_Err( p_input, "not enough data" );
@@ -168 +168 @@
-    }
-
-!strncmp( psz_parser, "HTTP/1.",
-                  strlen("HTTP/1.")
-
-trlen("HTTP 1.") + 2
+(i_size >= sizeof("HTTP/1.") + 1 ) &&
+   !strncmp( psz_parser, "HTTP/1.", sizeof("HTTP/1.") - 1
+
+izeof("HTTP/1.") + 1
-        i_returncode = atoi( (char*)psz_parser );
-        msg_Dbg( p_input, "HTTP server replied: %i", i_returncode );
-        psz_parser += 4;
-
+
+
+
-        {
-            ;
-        }
+     /* check we actually parsed something */
+        if ( (i == i_size - 1) && (psz_parser[i+1] != '\n') )
+        {
+            msg_Err( p_input, "stream not compliant with HTTP/1.x" );
+            return -1;
+        }
+
-        psz_return_alpha = malloc( i + 1 );
-        memcpy( psz_return_alpha, psz_parser, i );
@@ -188 +197 @@
-        return -1;
-    }
-
+
-    if ( i_returncode >= 400 ) /* something is wrong */
-    {