From 248c857a31b75865ac070b22a1fa711072be148e Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 3 Oct 2018 23:10:30 +0200 Subject: [PATCH] Reuse delivered length Fix length calculation --- win32/ioutil.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/ioutil.h b/win32/ioutil.h index db21c449e0f..e49b1050a00 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -774,7 +774,7 @@ __forceinline static ssize_t php_win32_ioutil_readlink(const char *path, char *b return ret; } - ret_buf = php_win32_ioutil_conv_w_to_any(retw, PHP_WIN32_CP_IGNORE_LEN, &ret_buf_len); + ret_buf = php_win32_ioutil_conv_w_to_any(retw, ret, &ret_buf_len); if (!ret_buf || ret_buf_len >= buf_len || ret_buf_len >= MAXPATHLEN) { free(pathw); SET_ERRNO_FROM_WIN32_CODE(ERROR_BAD_PATHNAME); @@ -784,7 +784,7 @@ __forceinline static ssize_t php_win32_ioutil_readlink(const char *path, char *b free(pathw); - return ret; + return ret_buf_len; }/*}}}*/ #ifdef __cplusplus