From: Zeev Suraski <zeev@php.net>
Date: Mon, 6 Dec 1999 15:30:44 +0000 (+0000)
Subject: opened_path could end up uninitialized - fixed
X-Git-Tag: PRE_RETURN_REF_PATCH~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5df43c134f6793d9364fd1c877ae57e9a110ad04;p=php

opened_path could end up uninitialized - fixed
---

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 2e0d317446..c3f32dd15b 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -186,6 +186,10 @@ PHPAPI FILE *php3_fopen_wrapper(char *path, char *mode, int options, int *issock
 	int cm=2;  /* checkuid mode: 2 = if file does not exist, check directory */
 	PLS_FETCH();
 
+	if (opened_path) {
+		*opened_path = NULL;
+	}
+
 	/* FIXME  Lets not get in the habit of doing stuff like this.  This should
 	   be runtime enabled, NOT compile time. */
 #if PHP3_URL_FOPEN
@@ -320,10 +324,11 @@ PHPAPI FILE *php3_fopen_with_path(char *filename, char *mode, char *path, char *
 	int cm=2;
 	PLS_FETCH();
 
-	if(!strcmp(mode,"r") || !strcmp(mode,"r+")) cm=0;
 	if (opened_path) {
 		*opened_path = NULL;
 	}
+
+	if(!strcmp(mode,"r") || !strcmp(mode,"r+")) cm=0;
 	/* Relative path open */
 	if (*filename == '.') {
 		if (PG(safe_mode) && (!_php3_checkuid(filename, cm))) {