- I wrote a long msg but the commit didn't go through.

- So here is the short version:
- a) Start moving to binary opens in Windows
- b) Give checkuid_mode() a small face lift including the fopen-wrappers.c
- The mode to this function should at least be a #define but that is for
- another day. Anyway this whole stuff should be given more face lifts in
- the future.

1 files changed, 5 insertions, 5 deletions

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index c3d8c29ce7..35758ce702 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -160,7 +160,7 @@ static gzFile php_gzopen_wrapper(char *path, char *mode, int options)
 		return php_gzopen_with_path(path, mode, PG(include_path), NULL);
 	}
 	else {
-		if (options & ENFORCE_SAFE_MODE && PG(safe_mode) && (!php_checkuid(path,1))) {
+		if (options & ENFORCE_SAFE_MODE && PG(safe_mode) && (!php_checkuid(path, NULL, 1))) {
 			return NULL;
 		}
 		if (php_check_open_basedir(path)) return NULL;
@@ -186,7 +186,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 	
 	/* Relative path open */
 	if (*filename == '.') {
-		if (PG(safe_mode) &&(!php_checkuid(filename,2))) {
+		if (PG(safe_mode) &&(!php_checkuid(filename, NULL, 2))) {
 			return(NULL);
 		}
 		if (php_check_open_basedir(filename)) return NULL;
@@ -209,7 +209,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 			} else {
 				strlcpy(trypath,filename,sizeof(trypath));
 			}
-			if (!php_checkuid(trypath,2)) {
+			if (!php_checkuid(trypath, NULL, 2)) {
 				return(NULL);
 			}
 			if (php_check_open_basedir(trypath)) return NULL;
@@ -225,7 +225,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 	}
 
 	if (!path || (path && !*path)) {
-		if (PG(safe_mode) &&(!php_checkuid(filename,2))) {
+		if (PG(safe_mode) &&(!php_checkuid(filename, NULL, 2))) {
 			return(NULL);
 		}
 		if (php_check_open_basedir(filename)) return NULL;
@@ -252,7 +252,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
 		}
 		snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename);
 		if (PG(safe_mode)) {
-			if (V_STAT(trypath,&sb) == 0 &&(!php_checkuid(trypath,2))) {
+			if (V_STAT(trypath,&sb) == 0 &&(!php_checkuid(trypath, NULL, 2))) {
 				efree(pathbuf);
 				return(NULL);
 			}