]>
Commit | Line | Data |
---|---|---|
2dfa3174 | 1 | Index: php4/main/rfc1867.c |
2 | =================================================================== | |
3 | RCS file: /repository/php4/main/rfc1867.c,v | |
4 | retrieving revision 1.55 | |
5 | retrieving revision 1.56 | |
6 | diff -u -r1.55 -r1.56 | |
7 | --- php4/main/rfc1867.c 2000/12/08 14:28:14 1.55 | |
8 | +++ php4/main/rfc1867.c 2001/01/03 10:52:26 1.56 | |
9 | @@ -167,11 +167,20 @@ | |
10 | SAFE_RETURN; | |
11 | } | |
12 | loc = memchr(ptr, '\n', rem); | |
13 | - name = strstr(ptr, " name=\""); | |
14 | + name = strstr(ptr, " name="); | |
15 | if (name && name < loc) { | |
16 | - name += 7; | |
17 | + name += 6; | |
18 | s = memchr(name, '\"', loc - name); | |
19 | - if (!s) { | |
20 | + if ( name == s ) { | |
21 | + name++; | |
22 | + s = memchr(name, '\"', loc - name); | |
23 | + if(!s) { | |
24 | + php_error(E_WARNING, "File Upload Mime headers garbled name: [%c%c%c%c%c]", *name, *(name + 1), *(name + 2), *(name + 3), *(name + 4)); | |
25 | + SAFE_RETURN; | |
26 | + } | |
27 | + } else if(!s) { | |
28 | + s = loc; | |
29 | + } else { | |
30 | php_error(E_WARNING, "File Upload Mime headers garbled name: [%c%c%c%c%c]", *name, *(name + 1), *(name + 2), *(name + 3), *(name + 4)); | |
31 | SAFE_RETURN; | |
32 | } |