[PATCH v4 1/1] gdi32: Ensure null termination in logfont_AtoW.

[Alex Henrie]

From: Alex Henrie

Fixes: 1d3bfdc3abdaaa45075f0ec04228b911ab5ab8cf
---
 dlls/gdi32/text.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c
index 7725e832c6b..46c8ac4e799 100644
--- a/dlls/gdi32/text.c
+++ b/dlls/gdi32/text.c
@@ -780,10 +780,11 @@ static void text_metric_ex_WtoA(const NEWTEXTMETRICEXW *tmW, NEWTEXTMETRICEXA *t

static void logfont_AtoW( const LOGFONTA *fontA, LPLOGFONTW fontW )
 {
-    memcpy( fontW, fontA, sizeof(LOGFONTA) - LF_FACESIZE );
-    MultiByteToWideChar( CP_ACP, 0, fontA->lfFaceName, strnlen( fontA->lfFaceName, LF_FACESIZE ),
-                         fontW->lfFaceName, LF_FACESIZE );
-    fontW->lfFaceName[LF_FACESIZE - 1] = 0;
+    int len = MultiByteToWideChar( CP_ACP, 0, fontA->lfFaceName,
+                                   strnlen( fontA->lfFaceName, LF_FACESIZE ),
+                                   fontW->lfFaceName, LF_FACESIZE );
+    fontW->lfFaceName[min( len, LF_FACESIZE - 1 )] = 0;
+    memcpy( fontW, fontA, offsetof(LOGFONTA, lfFaceName) );
 }

static void logfont_WtoA( const LOGFONTW *fontW, LPLOGFONTA fontA )