From a8c6c9f49a8c49a6e14fd4dc6a71f9ef7726180e Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Wed, 10 Feb 2016 13:09:44 +0300 Subject: [PATCH] usp10: Use memcpy() to return ScriptLayout() results. Signed-off-by: Nikolay Sivov Signed-off-by: Aric Stewart Signed-off-by: Alexandre Julliard --- dlls/usp10/usp10.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 253177a12e0..3b31867f7ec 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3645,7 +3645,6 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log if (!indexs) return E_OUTOFMEMORY; - if (vistolog) { for( ich = 0; ich < runs; ich++) @@ -3654,11 +3653,9 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderV2lLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - vistolog[ich] = indexs[ich]; + memcpy(vistolog, indexs, runs * sizeof(*vistolog)); } - if (logtovis) { for( ich = 0; ich < runs; ich++) @@ -3667,8 +3664,7 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log ich = 0; while (ich < runs) ich += BIDI_ReorderL2vLevel(0, indexs+ich, level+ich, runs - ich, FALSE); - for (ich = 0; ich < runs; ich++) - logtovis[ich] = indexs[ich]; + memcpy(logtovis, indexs, runs * sizeof(*logtovis)); } heap_free(indexs);