cvs: php4 /main rfc1867.c

stas Wed Jan 3 02:52:27 2001 EDT Modified files: /php4/main rfc1867.c Log: Fix #8486 (name= without quotes in MIME Content-Disposition header) Ported fix by kk/sas from PHP 3 Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.55 php4/main/rfc1867.c:1.56 --- php4/main/rfc1867.c:1.55 Fri Dec 8 06:28:14 2000 +++ php4/main/rfc1867.c Wed Jan 3 02:52:26 2001 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.55 2000/12/08 14:28:14 rasmus Exp $ */ +/* $Id: rfc1867.c,v 1.56 2001/01/03 10:52:26 stas Exp $ */ #include <stdio.h> #include "php.h" @@ -167,11 +167,20 @@ SAFE_RETURN; } loc = memchr(ptr, '\n', rem); - name = strstr(ptr, " name=\""); + name = strstr(ptr, " name="); if (name && name < loc) { - name += 7; + name += 6; s = memchr(name, '\"', loc - name); - if (!s) { + if ( name == s ) { + name++; + s = memchr(name, '\"', loc - name); + if(!s) { + php_error(E_WARNING, "File Upload Mime headers garbled name: [%c%c%c%c%c]", *name, *(name + 1), *(name + 2), *(name + 3), *(name + 4)); + SAFE_RETURN; + } + } else if(!s) { + s = loc; + } else { php_error(E_WARNING, "File Upload Mime headers garbled name: [%c%c%c%c%c]", *name, *(name + 1), *(name + 2), *(name + 3), *(name + 4)); SAFE_RETURN; }