cvs: php4(PHP_4_0_7) /main rfc1867.c
| From: | Stefan Esser | Date: | Thu, 21 Feb 2002 18:46:46 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /main rfc1867.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9419@lists.php.net to get a copy of this message | ||
sesser Thu Feb 21 13:46:46 2002 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/main rfc1867.c
Log:
fixing boundary check before someone other does it...
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.71.2.1 php4/main/rfc1867.c:1.71.2.2
--- php4/main/rfc1867.c:1.71.2.1 Mon Sep 24 13:48:22 2001
+++ php4/main/rfc1867.c Thu Feb 21 13:46:45 2002
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.71.2.1 2001/09/24 17:48:22 andi Exp $ */
+/* $Id: rfc1867.c,v 1.71.2.2 2002/02/21 18:46:45 sesser Exp $ */
#include <stdio.h>
#include "php.h"
@@ -195,7 +195,13 @@
SAFE_RETURN;
}
}
+ rem -= loc - ptr;
+ if (rem <= 0) {
+ php_error(E_WARNING, "File Upload Mime headers garbled ptr: [%c%c%c%c%c]", *ptr,
*(ptr + 1), *(ptr + 2), *(ptr + 3), *(ptr + 4));
+ SAFE_RETURN;
+ }
name = strstr(ptr, " name=");
+ ptr = loc;
if (name && name < loc) {
name += 6;
if ( *name == '\"' ) {