]> granicus.if.org Git - php/commitdiff
Fixed bug #44818 (php://memory writeable when opened read only)
authorArnaud Le Blanc <lbarnaud@php.net>
Tue, 11 Nov 2008 00:44:36 +0000 (00:44 +0000)
committerArnaud Le Blanc <lbarnaud@php.net>
Tue, 11 Nov 2008 00:44:36 +0000 (00:44 +0000)
ext/standard/php_fopen_wrapper.c
ext/standard/tests/streams/bug44818.phpt [new file with mode: 0644]

index 3f88dcaffc950210fb779b4f8a6f8802e28ef792..fffc6fe6e337d8304e7417375f8af559fa08a073 100644 (file)
@@ -186,11 +186,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 (file)
index 0000000..628f64e
--- /dev/null
@@ -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"