Changeset 21928 for trunk/src/user32/oslibdnd.cpp

Timestamp:

Dec 29, 2011, 5:04:29 PM (14 years ago)

Author:

dmik

Message:

Fix crash when doing drag & drop.

This is a regression after switching to GCC: tmpnam() returns
forward slashes, while the code expected backward ones.

File:

• trunk/src/user32/oslibdnd.cpp (modified) (2 diffs)

trunk/src/user32/oslibdnd.cpp

@@ -63 +63 @@
     char szDir[CCHMAXPATH*4];
     
-    pszFile = (char *)malloc(CCHMAXPATH+1);
+    pszFile = tempnam(0, 0);
     if(pszFile == NULL) {
         DebugInt3();
@@ -70 +70 @@
     }
 
-    tmpnam(pszFile);
     strcpy(szDir, pszFile);
 
     char *tmp = strrchr(szDir, '\\');
+    if (!tmp)
+        tmp = strrchr(szDir, '/');
+    if (!tmp) {
+        DebugInt3();
+        free(pszFile);
+        DrgFreeDraginfo(pdinfo);
+        return NULL;
+    }
+
     *tmp = 0;
     tmp++;