Henri Verbeet : wined3d: Get rid of a redundant strcpy().
Alexandre Julliard
julliard at winehq.org
Thu Sep 17 13:53:00 CDT 2009
Module: wine
Branch: master
Commit: 21241432f1e062d4d08f97c9a2d2caf498e46c33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=21241432f1e062d4d08f97c9a2d2caf498e46c33
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Sep 17 12:35:21 2009 +0200
wined3d: Get rid of a redundant strcpy().
---
dlls/wined3d/wined3d_main.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 67b1acd..5f19c26 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -5,6 +5,7 @@
* Copyright 2002-2003 Raphael Junqueira
* Copyright 2004 Jason Edmeades
* Copyright 2007-2008 Stefan Dösinger for CodeWeavers
+ * Copyright 2009 Henri Verbeet for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -293,8 +294,11 @@ static BOOL wined3d_init(HINSTANCE hInstDLL)
}
if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) )
{
- wined3d_settings.logo = HeapAlloc(GetProcessHeap(), 0, strlen(buffer) + 1);
- if(wined3d_settings.logo) strcpy(wined3d_settings.logo, buffer);
+ size_t len = strlen(buffer) + 1;
+
+ wined3d_settings.logo = HeapAlloc(GetProcessHeap(), 0, len);
+ if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n");
+ else memcpy(wined3d_settings.logo, buffer, len);
}
if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) )
{
More information about the wine-cvs
mailing list