diff options
| author | Arnaud Le Blanc <lbarnaud@php.net> | 2008-11-11 00:44:55 +0000 |
|---|---|---|
| committer | Arnaud Le Blanc <lbarnaud@php.net> | 2008-11-11 00:44:55 +0000 |
| commit | f6345133b39a3c951ef267985dfe3c5f20cff2c5 (patch) | |
| tree | 0173ae61aeb89439dcedc6ee9cf337bdac694ca9 /ext | |
| parent | dcdf00bdfca5d432998ac9fdf17f36212368d4ff (diff) | |
| download | php-git-f6345133b39a3c951ef267985dfe3c5f20cff2c5.tar.gz | |
MFH: Fixed bug #44818 (php://memory writeable when opened read only)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/php_fopen_wrapper.c | 14 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug44818.phpt | 37 |
2 files changed, 49 insertions, 2 deletions
diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 3d380344a9..a7c685a580 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -177,11 +177,21 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, ch return NULL; } } - return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory); + if (strpbrk(mode, "wa+")) { + mode_rw = TEMP_STREAM_DEFAULT; + } else { + mode_rw = TEMP_STREAM_READONLY; + } + return php_stream_temp_create(mode_rw, max_memory); } if (!strcasecmp(path, "memory")) { - return php_stream_memory_create(TEMP_STREAM_DEFAULT); + if (strpbrk(mode, "wa+")) { + mode_rw = TEMP_STREAM_DEFAULT; + } else { + mode_rw = TEMP_STREAM_READONLY; + } + return php_stream_memory_create(mode_rw); } if (!strcasecmp(path, "output")) { diff --git a/ext/standard/tests/streams/bug44818.phpt b/ext/standard/tests/streams/bug44818.phpt new file mode 100644 index 0000000000..628f64e341 --- /dev/null +++ b/ext/standard/tests/streams/bug44818.phpt @@ -0,0 +1,37 @@ +--TEST-- +Bug #44818 (php://memory writeable when opened read only) +--FILE-- +<?php +function test($url, $mode) { + echo "$url, $mode\n"; + $fd = fopen($url, $mode); + var_dump($fd, fwrite($fd, b"foo")); + var_dump(fseek($fd, 0, SEEK_SET), fread($fd, 3)); + fclose($fd); +} +test("php://memory","r"); +test("php://memory","r+"); +test("php://temp","r"); +test("php://temp","w"); +?> +--EXPECTF-- +php://memory, r +resource(%d) of type (stream) +int(0) +int(0) +string(0) "" +php://memory, r+ +resource(%d) of type (stream) +int(3) +int(0) +string(3) "foo" +php://temp, r +resource(%d) of type (stream) +int(0) +int(0) +string(0) "" +php://temp, w +resource(%d) of type (stream) +int(3) +int(0) +string(3) "foo" |