]> granicus.if.org Git - php/commitdiff
- fix write access check when write mode only is requested (not RW)
authorPierre Joye <pajoye@php.net>
Thu, 4 Feb 2010 19:54:04 +0000 (19:54 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 4 Feb 2010 19:54:04 +0000 (19:54 +0000)
TSRM/tsrm_win32.c

index 72d55e9178353c7dbf823019fe9929633023de5c..7f1cf7ce04bfb405810b7672ed8b41c173e71aff 100644 (file)
@@ -303,7 +303,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
                                fAccess = bucket->is_writable;
                                goto Finished;
                        }
-                       desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
+                       desired_access = FILE_GENERIC_WRITE;
                } else if(mode <= 4) {
                        if(bucket != NULL && bucket->is_rvalid) {
                                fAccess = bucket->is_readable;
@@ -348,6 +348,11 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
                        else if(desired_access == FILE_GENERIC_WRITE) {
                                bucket->is_wvalid = 1;
                                bucket->is_writable = fAccess;
+                       } else if (desired_access == FILE_GENERIC_READ | FILE_GENERIC_WRITE) {
+                               bucket->is_rvalid = 1;
+                               bucket->is_readable = fAccess;
+                               bucket->is_wvalid = 1;
+                               bucket->is_writable = fAccess;
                        }
                }