commit b0926916f63b2d23180d3933be48870cbf75941e
author Dave Rodgman <dave.rodgman@arm.com> Mon Feb 20 15:11:32 2023 +0000
committer GitHub <noreply@github.com> Mon Feb 20 15:11:32 2023 +0000
tree fbf1446df6b6afcffa5b429239ed3fb604feecd9
parent 908e810098a216a448f1065c509c3dac8a6b5821
parent 0289c19b8aefbaa5d5ba930ceab4d4489a05916d

Merge pull request #7086 from tom-cosgrove-arm/dont-use-lstrlenW-228

Backport 2.28: Don't use lstrlenW() on Windows

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index cb2740f..e7fcaf4 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1601,8 +1601,8 @@
         }
 
         w_ret = WideCharToMultiByte(CP_ACP, 0, file_data.cFileName,
-                                    lstrlenW(file_data.cFileName),
-                                    p, (int) len - 1,
+                                    -1,
+                                    p, (int) len,
                                     NULL, NULL);
         if (w_ret == 0) {
             ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;