From: Anatol Belski Date: Fri, 19 Sep 2014 13:44:04 +0000 (+0200) Subject: expand IS_ABSOLUTE_PATH on Windows, so then strlen() isn't called twice X-Git-Tag: POST_NATIVE_TLS_MERGE^2~185 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=149db936d43ba31bb41da62b0d26d510f32514ee;p=php expand IS_ABSOLUTE_PATH on Windows, so then strlen() isn't called twice --- diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 3c432de9ad..8bc0d272b7 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -70,7 +70,7 @@ typedef unsigned short mode_t; #define IS_UNC_PATH(path, len) \ (len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1])) #define IS_ABSOLUTE_PATH(path, len) \ - (len >= 2 && ((isalpha(path[0]) && path[1] == ':') || IS_UNC_PATH(path, len))) + (len >= 2 && ((/* is local */isalpha(path[0]) && path[1] == ':') || /* is UNC */IS_SLASH(path[0]) && IS_SLASH(path[1]))) #elif defined(NETWARE) #ifdef HAVE_DIRENT_H