From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 10 Mar 2016 06:24:13 +0000 (+0800)
Subject: tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
X-Git-Tag: php-7.0.5RC1~10^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d5f71b0b125c89211e5a2a6d925deba938abd41;p=php

tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
---

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 5e2189c6d9..969d09e8dd 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -597,12 +597,13 @@ static inline zend_ulong realpath_cache_key(const char *path, int path_len) /* {
 	register zend_ulong h;
 	char *bucket_key_start = tsrm_win32_get_path_sid_key(path);
 	char *bucket_key = (char *)bucket_key_start;
-	const char *e = bucket_key + strlen(bucket_key);
+	const char *e;
 
 	if (!bucket_key) {
 		return 0;
 	}
 
+	e = bucket_key + strlen(bucket_key);
 	for (h = Z_UL(2166136261); bucket_key < e;) {
 		h *= Z_UL(16777619);
 		h ^= *bucket_key++;