From: Anatol Belski <ab@php.net>
Date: Wed, 3 Oct 2018 21:10:30 +0000 (+0200)
Subject: Reuse delivered length
X-Git-Tag: php-7.4.0alpha1~1770
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=248c857a31b75865ac070b22a1fa711072be148e;p=php

Reuse delivered length

Fix length calculation
---

diff --git a/win32/ioutil.h b/win32/ioutil.h
index db21c449e0..e49b1050a0 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