Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix readlink related memory leak
This commit is contained in:
Christoph M. Becker 2020-07-16 09:18:45 +02:00
commit b31c787401

View File

@ -786,12 +786,14 @@ __forceinline static ssize_t php_win32_ioutil_readlink(const char *path, char *b
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(ret_buf);
free(pathw);
SET_ERRNO_FROM_WIN32_CODE(ERROR_BAD_PATHNAME);
return -1;
}
memcpy(buf, ret_buf, ret_buf_len + 1);
free(ret_buf);
free(pathw);
return ret_buf_len;