archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fix normalized path length calculation and error handling
This commit is contained in:
Anatol Belski 2017-11-27 12:33:23 +01:00
commit 155b244c12
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
win32/ioutil.c
View file

@ -538,6 +538,7 @@ PW32IO size_t php_win32_ioutil_dirname(char *path, size_t len)
return ret_len; return ret_len;
}/*}}}*/ }/*}}}*/
/* Partial normalization can still be acceptable, explicit fail has to be caught. */
PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(wchar_t **buf, size_t len, size_t *new_len) PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(wchar_t **buf, size_t len, size_t *new_len)
{/*{{{*/ {/*{{{*/
wchar_t *pos, *idx = *buf, canonicalw[MAXPATHLEN]; wchar_t *pos, *idx = *buf, canonicalw[MAXPATHLEN];
@ -545,6 +546,7 @@ PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(w
if (len >= MAXPATHLEN) { if (len >= MAXPATHLEN) {
SET_ERRNO_FROM_WIN32_CODE(ERROR_BAD_LENGTH); SET_ERRNO_FROM_WIN32_CODE(ERROR_BAD_LENGTH);
*new_len = 0;
return PHP_WIN32_IOUTIL_NORM_FAIL; return PHP_WIN32_IOUTIL_NORM_FAIL;
} }
@ -554,6 +556,8 @@ PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(w
} }
if (S_OK != canonicalize_path_w(canonicalw, MAXPATHLEN, *buf, PATHCCH_ALLOW_LONG_PATHS)) { if (S_OK != canonicalize_path_w(canonicalw, MAXPATHLEN, *buf, PATHCCH_ALLOW_LONG_PATHS)) {
/* Length unchanged. */
*new_len = len;
return PHP_WIN32_IOUTIL_NORM_PARTIAL; return PHP_WIN32_IOUTIL_NORM_PARTIAL;
} }
ret_len = wcslen(canonicalw); ret_len = wcslen(canonicalw);
@ -562,6 +566,8 @@ PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(w
wchar_t *tmp = realloc(*buf, (ret_len + 1) * sizeof(wchar_t)); wchar_t *tmp = realloc(*buf, (ret_len + 1) * sizeof(wchar_t));
if (!tmp) { if (!tmp) {
SET_ERRNO_FROM_WIN32_CODE(ERROR_NOT_ENOUGH_MEMORY); SET_ERRNO_FROM_WIN32_CODE(ERROR_NOT_ENOUGH_MEMORY);
/* Length unchanged. */
*new_len = len;
return PHP_WIN32_IOUTIL_NORM_PARTIAL; return PHP_WIN32_IOUTIL_NORM_PARTIAL;
} }
*buf = tmp; *buf = tmp;

12
win32/ioutil.h
View file

@ -177,17 +177,17 @@ __forceinline static wchar_t *php_win32_ioutil_conv_any_to_w(const char* in, siz
return NULL; return NULL;
} }
/* The return can be ignored here, as the normalization can fail for if (PHP_WIN32_IOUTIL_NORM_FAIL == php_win32_ioutil_normalize_path_w(&mb, mb_len, &new_mb_len)) {
various reasons not directly related to the operation itself. free(ret);
Partial normalization could still do a better job further. And free(mb);
otherwise, the path might be unchanged which is ok if the path return NULL;
was valid long one. */ }
(void)php_win32_ioutil_normalize_path_w(&mb, mb_len, &new_mb_len);
if (new_mb_len > mb_len) { if (new_mb_len > mb_len) {
wchar_t *tmp = (wchar_t *) realloc(ret, (new_mb_len + 1) * sizeof(wchar_t)); wchar_t *tmp = (wchar_t *) realloc(ret, (new_mb_len + 1) * sizeof(wchar_t));
if (!tmp) { if (!tmp) {
free(ret); free(ret);
free(mb);
return NULL; return NULL;
} }
ret = tmp; ret = tmp;