[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22112] trunk/blender/intern/ghost/intern: sizeof() was being used incorrectly to clear X11 m_keyboard_vector, would only have 4-8 bytes cleared rather then 32.

[Campbell Barton]

Revision: 22112
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22112
Author:   campbellbarton
Date:     2009-08-01 11:07:45 +0200 (Sat, 01 Aug 2009)

Log Message:
-----------
sizeof() was being used incorrectly to clear X11 m_keyboard_vector, would only 
have 4-8 bytes cleared rather then 32.
fix for harmless memleak too.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.h

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp       2009-08-01 
06:44:18 UTC (rev 22111)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp       2009-08-01 
09:07:45 UTC (rev 22112)
@@ -145,11 +145,9 @@
        GHOST_TSuccess success = GHOST_System::init();
 
        if (success) {
-               m_keyboard_vector = new char[32];
-
                m_displayManager = new GHOST_DisplayManagerX11(this);
 
-               if (m_keyboard_vector && m_displayManager) {
+               if (m_displayManager) {
                        return GHOST_kSuccess;
                }
        }
@@ -672,9 +670,9 @@
 
        // analyse the masks retuned from XQueryPointer.
 
-       memset(m_keyboard_vector,0,sizeof(m_keyboard_vector));
+       memset((void *)m_keyboard_vector,0,sizeof(m_keyboard_vector));
 
-       XQueryKeymap(m_display,m_keyboard_vector);
+       XQueryKeymap(m_display,(char *)m_keyboard_vector);
 
        // now translate key symobols into keycodes and
        // test with vector.

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.h 2009-08-01 06:44:18 UTC 
(rev 22111)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.h 2009-08-01 09:07:45 UTC 
(rev 22112)
@@ -246,7 +246,7 @@
        GHOST_TUns64 m_start_time;
 
        /// A vector of keyboard key masks
-       char *m_keyboard_vector;
+       char m_keyboard_vector[32];
 
        /**
         * Return the ghost window associated with the


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs