From e9927994eb66196fa26b65dcc1c30c03f01cf9a5 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 27 Nov 2017 14:01:55 +0100 Subject: [PATCH] Sync with the POSIX signature --- win32/ioutil.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32/ioutil.h b/win32/ioutil.h index a22ca3eb14..01e8e2319b 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -466,14 +466,14 @@ __forceinline static int php_win32_ioutil_chdir(const char *patha) return ret; }/*}}}*/ -__forceinline static char *php_win32_ioutil_getcwd(char *buf, int len) +__forceinline static char *php_win32_ioutil_getcwd(char *buf, size_t len) {/*{{{*/ wchar_t tmp_bufw[PHP_WIN32_IOUTIL_MAXPATHLEN]; char *tmp_bufa = NULL; size_t tmp_bufa_len; DWORD err = 0; - if (php_win32_ioutil_getcwd_w(tmp_bufw, PHP_WIN32_IOUTIL_MAXPATHLEN) == NULL) { + if (php_win32_ioutil_getcwd_w(tmp_bufw, len) == NULL) { err = GetLastError(); SET_ERRNO_FROM_WIN32_CODE(err); return NULL; @@ -494,7 +494,7 @@ __forceinline static char *php_win32_ioutil_getcwd(char *buf, int len) /* If buf was NULL, the result has to be freed outside here. */ buf = tmp_bufa; } else { - if (tmp_bufa_len + 1 > (size_t)len) { + if (tmp_bufa_len + 1 > len) { free(tmp_bufa); SET_ERRNO_FROM_WIN32_CODE(ERROR_INSUFFICIENT_BUFFER); return NULL; -- 2.50.1