Changeset 377 for trunk/dll/collect.c

Timestamp:

Jul 27, 2006, 8:28:31 AM (19 years ago)

Author:

root

Message:

Validate WinCreateWindow

File:

• trunk/dll/collect.c (modified) (3 diffs)

trunk/dll/collect.c

@@ -3003 +3003 @@
     WinSetWindowUShort(hwndFrame, QWS_ID, id);
     dcd = xmallocz(sizeof(DIRCNRDATA),pszSrcFile,__LINE__);
-    if (dcd) {
+    if (!dcd) {
+      Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
+      hwndFrame = (HWND) 0;
+    }
+    else {
       dcd -> size = sizeof(DIRCNRDATA);
       dcd -> id = id;
@@ -3036 +3041 @@
                                        NULL,
                                        NULL);
-      if (dcd -> hwndCnr)
-      {
+      if (!dcd -> hwndCnr) {
+        Win_Error2(hwndClient,hwndClient,pszSrcFile,__LINE__,IDS_WINCREATEWINDOW);
+        PostMsg(hwndClient,WM_CLOSE,MPVOID,MPVOID);
+        free(dcd);
+        hwndFrame = (HWND) 0;
+      }
+      else {
         Collector = dcd -> hwndCnr;
         WinSetWindowPtr(dcd -> hwndCnr, QWL_USER, (PVOID) dcd);
@@ -3094 +3104 @@
                      MPVOID);
       }
-      else
-      {
-        PostMsg(hwndClient,
-                WM_CLOSE,
-                MPVOID,
-                MPVOID);
-        free(dcd);
-        hwndFrame = (HWND) 0;
-      }
-    }
-    else
-    {
-      PostMsg(hwndClient,
-              WM_CLOSE,
-              MPVOID,
-              MPVOID);
-      hwndFrame = (HWND) 0;
     }
   }