Changeset 3815 for trunk/src

Timestamp:

Jul 10, 2000, 8:38:52 PM (25 years ago)

Author:

sandervl

Message:

check if module contains resources before searching for a resource object

Location:

trunk/src/kernel32

Files:

• heapstring.cpp (modified) (2 diffs)
• winimgres.cpp (modified) (4 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.29 2000-07-06 21:18:42 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.30 2000-07-10 18:38:51 sandervl Exp $ */
 
 /*
@@ -5 +5 @@
  *
  * Win32 compatibility string functions for OS/2
+ *
+ * NOTE: lstrcpyn* always appends a terminating 0 (unlike strncpy)!
  *
  * Copyright 1999 Patrick Haller

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.42 2000-06-28 18:08:36 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.43 2000-07-10 18:38:52 sandervl Exp $ */
 
 /*
@@ -508 +508 @@
     int     idName = -1;
 
+    if(pResDirToSearch == NULL) {
+        return NULL;
+    }
+
     /* lpszName */
     if ((ULONG)lpszName != ID_GETFIRST && HIWORD(lpszName) != 0)
@@ -578 +582 @@
     LPCWSTR                     lpszwName;
 
+    if(pResDirToSearch == NULL) {
+        return NULL;
+    }
+
     /* lpszName */
     if ((ULONG)lpszName != ID_GETFIRST && HIWORD(lpszName) != 0)
@@ -614 +622 @@
     int     i;
 
+    if(pResDirToSearch == NULL) {
+        return NULL;
+    }
+
     paResDirEntries = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((ULONG)pResDirToSearch + sizeof(*pResDirToSearch));