Changeset 4526 for trunk/src/kernel32/stubs.cpp

Timestamp:

Oct 25, 2000, 9:47:00 PM (25 years ago)

Author:

sandervl

Message:

SearchPathA fix (multiple dirs), add rename odin.ini entry for winspool.drv, extra pointer checks in Read/WriteProcessMemory

File:

• trunk/src/kernel32/stubs.cpp (modified) (3 diffs)

trunk/src/kernel32/stubs.cpp

@@ -1686 +1686 @@
 
 DWORD WIN32API ReadProcessMemory(HANDLE  hProcess,
-                                    LPCVOID lpBaseAddress,
-                                    LPVOID  lpBuffer,
-                                    DWORD   cbRead,
-                                    LPDWORD lpNumberOfBytesRead)
-{
-  dprintf(("Kernel32: ReadProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+                                 LPCVOID lpBaseAddress,
+                                 LPVOID  lpBuffer,
+                                 DWORD   cbRead,
+                                 LPDWORD lpNumberOfBytesRead)
+{
+  dprintf(("Kernel32: ReadProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not completely implemented",
            hProcess,
            lpBaseAddress,
@@ -1699 +1699 @@
 
   // do some (faked) access check
-  if (hProcess != GetCurrentProcess())
+  if(hProcess != GetCurrentProcess())
   {
-    SetLastError(ERROR_ACCESS_DENIED);
-    return FALSE;
+        dprintf(("WARNING: ReadProcessMemory: can't read memory from other processes!"));
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
   }
 
-  
+  if(IsBadReadPtr(lpBaseAddress, cbRead)) {
+        dprintf(("ERROR: ReadProcessMemory bad source pointer!"));
+        if(lpNumberOfBytesRead)
+            *lpNumberOfBytesRead = 0;
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
+  }
   // FIXME: check this, if we ever run win32 binaries in different addressspaces
   //    ... and add a sizecheck
   memcpy(lpBuffer,lpBaseAddress,cbRead);
-  if (lpNumberOfBytesRead) 
-    *lpNumberOfBytesRead = cbRead;
-  
+  if(lpNumberOfBytesRead)
+        *lpNumberOfBytesRead = cbRead;
+
+  SetLastError(ERROR_SUCCESS);
   return TRUE;
 }
@@ -1740 +1748 @@
 {
   // do some (faked) access check
-  if (hProcess != GetCurrentProcess())
+  if(hProcess != GetCurrentProcess())
   {
-    dprintf(("Kernel32: WriteProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented (different process!!)",
-           hProcess,
-           lpBaseAddress,
-           lpBuffer,
-           cbWrite,
-           lpNumberOfBytesWritten));
-    SetLastError(ERROR_ACCESS_DENIED);
-    return FALSE;
+        dprintf(("Kernel32: WriteProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented (different process!!)",
+                 hProcess, lpBaseAddress, lpBuffer, cbWrite, lpNumberOfBytesWritten));
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
   }
   dprintf(("Kernel32: WriteProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh))",
-           hProcess,
-           lpBaseAddress,
-           lpBuffer,
-           cbWrite,
-           lpNumberOfBytesWritten));
-  
+           hProcess,lpBaseAddress, lpBuffer, cbWrite, lpNumberOfBytesWritten));
+
+  if(IsBadWritePtr((LPVOID)lpBaseAddress, cbWrite))
+  {
+        dprintf(("ERROR: WriteProcessMemory bad destination pointer!"));
+        if(lpNumberOfBytesWritten)
+            *lpNumberOfBytesWritten = 0;
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
+  }
+
   // FIXME: check this, if we ever run win32 binaries in different addressspaces
   //    ... and add a sizecheck
   memcpy((void*)lpBaseAddress,lpBuffer,cbWrite);
-  if (lpNumberOfBytesWritten) 
-    *lpNumberOfBytesWritten = cbWrite;
-  
+  if(lpNumberOfBytesWritten)
+        *lpNumberOfBytesWritten = cbWrite;
+
+  SetLastError(ERROR_SUCCESS);
   return TRUE;
 }