1 files changed, 24 insertions, 13 deletions

diff --git a/xorg-server/hw/xwin/winmultiwindowclass.c b/xorg-server/hw/xwin/winmultiwindowclass.c
index ced8f4554..1e544ec5f 100644..100755
--- a/xorg-server/hw/xwin/winmultiwindowclass.c
+++ b/xorg-server/hw/xwin/winmultiwindowclass.c
@@ -68,7 +68,7 @@ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
     while (prop) {
         if (prop->propertyName == XA_WM_CLASS
             && prop->type == XA_STRING && prop->format == 8 && prop->data) {
-            len_name = strlen((char *) prop->data);
+            len_name = strnlen((char *) prop->data, prop->size);
 
             (*res_name) = malloc(len_name + 1);
 
@@ -78,12 +78,18 @@ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
             }
 
             /* Add one to len_name to allow copying of trailing 0 */
-            strncpy((*res_name), prop->data, len_name + 1);
+            memcpy((*res_name), prop->data, len_name );
+            (*res_name)[len_name]='\0';
 
-            if (len_name == prop->size)
-                len_name--;
-
-            len_class = strlen(((char *) prop->data) + 1 + len_name);
+            if (len_name < prop->size-1)
+            {
+              // It could be that the string is not null terminated
+              len_class = strnlen(((char *) prop->data) + 1 + len_name, prop->size-1-len_name);
+            }
+            else
+            {
+              len_class = 0;
+            }
 
             (*res_class) = malloc(len_class + 1);
 
@@ -95,7 +101,8 @@ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
                 return 0;
             }
 
-            strcpy((*res_class), ((char *) prop->data) + 1 + len_name);
+            memcpy((*res_class), ((char *) prop->data) + 1 + len_name, len_class);
+            (*res_class)[len_class]='\0';
 
             return 1;
         }
@@ -127,8 +134,9 @@ winMultiWindowGetWMHints(WindowPtr pWin, WinXWMHints * hints)
     memset(hints, 0, sizeof(WinXWMHints));
 
     while (prop) {
-        if (prop->propertyName == XA_WM_HINTS && prop->data) {
-            memcpy(hints, prop->data, sizeof(WinXWMHints));
+        if (prop->propertyName == XA_WM_HINTS && prop->data
+            && prop->format == 32) {
+            memcpy (hints, prop->data, 4*(int)prop->size); /* format/8 = 4 */
             return 1;
         }
         else
@@ -201,8 +209,9 @@ winMultiWindowGetWMNormalHints(WindowPtr pWin, WinXSizeHints * hints)
     memset(hints, 0, sizeof(WinXSizeHints));
 
     while (prop) {
-        if (prop->propertyName == XA_WM_NORMAL_HINTS && prop->data) {
-            memcpy(hints, prop->data, sizeof(WinXSizeHints));
+        if (prop->propertyName == XA_WM_NORMAL_HINTS && prop->data
+            && prop->format == 32) {
+            memcpy (hints, prop->data, 4*(int)prop->size); /* format/8 = 4 */
             return 1;
         }
         else
@@ -234,9 +243,11 @@ winMultiWindowGetTransientFor(WindowPtr pWin, Window *pDaddyId)
         *pDaddyId = 0;
 
     while (prop) {
-        if (prop->propertyName == XA_WM_TRANSIENT_FOR) {
+        if (prop->propertyName == XA_WM_TRANSIENT_FOR
+            && prop->format == 32
+            && prop->data) {
             if (pDaddyId)
-                memcpy(pDaddyId, prop->data, sizeof(Window));
+                memcpy (pDaddyId, prop->data, 4*(int)prop->size); /* format/8 = 4 */
             return 1;
         }
         else