com php-src: Merge branch 'PHP-7.1': win32/ioutil.h
| From: | Anatol Belski | Date: | Fri, 14 Jul 2017 11:24:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1': win32/ioutil.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98557@lists.php.net to get a copy of this message | ||
Commit: b5fd99b636dfd85632cbec08891184b133cf6264
Author: Anatol Belski <ab@php.net> Fri, 14 Jul 2017 13:24:21 +0200
Parents: b280ba854a6ec0e42a562c5bedfda51ae86ba23e 5d15fdc4a4db22552105e8275b6d3ef417219d66
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b5fd99b636dfd85632cbec08891184b133cf6264
Log:
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74923 Crash when crawling through network share
Bugs:
https://bugs.php.net/74923
Changed paths:
MM win32/ioutil.h
Diff:
diff --cc win32/ioutil.h
index 9987744,9aac1c4..120d692
--- a/win32/ioutil.h
+++ b/win32/ioutil.h
@@@ -112,10 -112,12 +112,14 @@@ typedef enum
#define PHP_WIN32_IOUTIL_IS_LONG_PATHW(pathw, path_lenw) (path_lenw >=
PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW \
&& 0 == wcsncmp((pathw), PHP_WIN32_IOUTIL_LONG_PATH_PREFIXW,
PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW))
+ #define PHP_WIN32_IOUTIL_IS_UNC_PATHW(pathw, path_lenw) (path_lenw >=
PHP_WIN32_IOUTIL_UNC_PATH_PREFIX_LENW \
+ && 0 == wcsncmp((pathw), PHP_WIN32_IOUTIL_UNC_PATH_PREFIXW,
PHP_WIN32_IOUTIL_UNC_PATH_PREFIX_LENW))
+ #define PHP_WIN32_IOUTIL_IS_JUNCTION_PATHW(pathw, path_lenw) (path_lenw >=
PHP_WIN32_IOUTIL_JUNCTION_PREFIX_LENW \
+ && 0 == wcsncmp((pathw), PHP_WIN32_IOUTIL_JUNCTION_PREFIXW,
PHP_WIN32_IOUTIL_JUNCTION_PREFIX_LENW))
#define PHP_WIN32_IOUTIL_IS_ABSOLUTEW(pathw, path_lenw) (PHP_WIN32_IOUTIL_IS_LONG_PATHW(pathw,
path_lenw) \
|| path_lenw >= 3 && PHP_WIN32_IOUTIL_IS_LETTERW(pathw[0]) && L':'
== pathw[1] && IS_SLASHW(pathw[2]))
+#define PHP_WIN32_IOUTIL_IS_UNC(pathw, path_lenw) (path_lenw >= 2 &&
PHP_WIN32_IOUTIL_IS_SLASHW(pathw[0]) && PHP_WIN32_IOUTIL_IS_SLASHW(pathw[1]) \
+ || path_lenw >= PHP_WIN32_IOUTIL_UNC_PATH_PREFIX_LENW && 0 == wcsncmp((pathw),
PHP_WIN32_IOUTIL_UNC_PATH_PREFIXW, PHP_WIN32_IOUTIL_UNC_PATH_PREFIX_LENW))
#define PHP_WIN32_IOUTIL_INIT_W(path) \
wchar_t *pathw = php_win32_ioutil_any_to_w(path); \