hlink: Avoid double computation of the string length.

f740a280 · Dmitry Timoshkov · Alexandre Julliard · 145e0604 · f740a280
Commit f740a280 authored Aug 03, 2006 by Dmitry Timoshkov Committed by Alexandre Julliard Aug 03, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

link.c dlls/hlink/link.c +8 -4

No files found.
--- a/dlls/hlink/link.c
+++ b/dlls/hlink/link.c
@@ -72,24 +72,28 @@ static inline HlinkImpl* HlinkImpl_from_IDataObject( IDataObject* iface)
 static inline LPWSTR strdupW( LPCWSTR str )
 {
    LPWSTR r;
+    UINT len;

    if (!str)
        return NULL;
-    r = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(str)+1) * sizeof (WCHAR));
+    len = (lstrlenW(str)+1) * sizeof (WCHAR);
+    r = HeapAlloc(GetProcessHeap(), 0, len);
    if (r)
-        lstrcpyW(r, str);
+        memcpy(r, str, len);
    return r;
 }

 static inline LPWSTR co_strdupW( LPCWSTR str )
 {
    LPWSTR r;
+    UINT len;

    if (!str)
        return NULL;
-    r = CoTaskMemAlloc((lstrlenW(str)+1) * sizeof (WCHAR));
+    len = (lstrlenW(str)+1) * sizeof (WCHAR);
+    r = CoTaskMemAlloc(len);
    if (r)
-        lstrcpyW(r, str);
+        memcpy(r, str, len);
    return r;
 }