[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35612] trunk/blender/intern/ghost/intern/ GHOST_SystemWin32.cpp: Fix for crasher on Win XP, submitted by Kanttori.

[Nathan Letwory]

Revision: 35612
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35612
Author:   jesterking
Date:     2011-03-18 13:36:52 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Fix for crasher on Win XP, submitted by Kanttori.

size is 32 on XP, while sizeof(ri) gives 40. Pick the smaller one to pass to memcpy to prevent crashes.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2011-03-18 12:12:53 UTC (rev 35611)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2011-03-18 13:36:52 UTC (rev 35612)
@@ -450,7 +450,7 @@
 		GetRawInputData((HRAWINPUT)lParam, RID_INPUT, data, &size, sizeof(RAWINPUTHEADER)))
 	{
 		RAWINPUT ri;
-		memcpy(&ri,data,sizeof(ri));
+		memcpy(&ri,data,(size < sizeof(ri)) ? size : sizeof(ri));
 
 		if (ri.header.dwType == RIM_TYPEKEYBOARD)
 		{