darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* win32-nat.c (get_image_name): Check return value from ReadProcessMemory.

Browse source 
(child_xfer_memory): Ditto.
This commit is contained in:
Christopher Faylor 2003-02-21 02:29:18 +00:00
parent 3decd77d89
commit 6f17862b81
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2003-02-20 Christopher Faylor <cgf@redhat.com>
* win32-nat.c (get_image_name): Check return value from
ReadProcessMemory.
(child_xfer_memory): Ditto.
2003-02-20 Alexandre Oliva <aoliva@redhat.com>
* configure.in (TARGET_SYSTEM_ROOT): Set default to

27
gdb/win32-nat.c
View file

@ -635,21 +635,16 @@ get_image_name (HANDLE h, void *address, int unicode)
if (address == NULL)
return NULL;
ReadProcessMemory (h, address, &address_ptr, sizeof (address_ptr), &done);
/* See if we could read the address of a string, and that the
address isn't null. */
if (done != sizeof (address_ptr) || !address_ptr)
if (!ReadProcessMemory (h, address, &address_ptr, sizeof (address_ptr), &done)
|| done != sizeof (address_ptr) || !address_ptr)
return NULL;
/* Find the length of the string */
do
{
ReadProcessMemory (h, address_ptr + len * size, &b, size, &done);
len++;
}
while ((b[0] != 0 || b[size - 1] != 0) && done == size);
while (ReadProcessMemory (h, address_ptr + len++ * size, &b, size, &done)
&& (b[0] != 0 || b[size - 1] != 0) && done == size)
continue;
if (!unicode)
ReadProcessMemory (h, address_ptr, buf, len, &done);
@ -1863,21 +1858,23 @@ child_xfer_memory (CORE_ADDR memaddr, char *our, int len,
int write, struct mem_attrib *mem,
struct target_ops *target)
{
DWORD done;
DWORD done = 0;
if (write)
{
DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08lx\n",
len, (DWORD) memaddr));
WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our,
len, &done);
if (!WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our,
len, &done))
done = 0;
FlushInstructionCache (current_process_handle, (LPCVOID) memaddr, len);
}
else
{
DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08lx\n",
len, (DWORD) memaddr));
ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our, len,
&done);
if (!ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our,
len, &done))
done = 0;
}
return done;
}

27
gdb/windows-nat.c
View file

@ -635,21 +635,16 @@ get_image_name (HANDLE h, void *address, int unicode)
if (address == NULL)
return NULL;
ReadProcessMemory (h, address, &address_ptr, sizeof (address_ptr), &done);
/* See if we could read the address of a string, and that the
address isn't null. */
if (done != sizeof (address_ptr) || !address_ptr)
if (!ReadProcessMemory (h, address, &address_ptr, sizeof (address_ptr), &done)
|| done != sizeof (address_ptr) || !address_ptr)
return NULL;
/* Find the length of the string */
do
{
ReadProcessMemory (h, address_ptr + len * size, &b, size, &done);
len++;
}
while ((b[0] != 0 || b[size - 1] != 0) && done == size);
while (ReadProcessMemory (h, address_ptr + len++ * size, &b, size, &done)
&& (b[0] != 0 || b[size - 1] != 0) && done == size)
continue;
if (!unicode)
ReadProcessMemory (h, address_ptr, buf, len, &done);
@ -1863,21 +1858,23 @@ child_xfer_memory (CORE_ADDR memaddr, char *our, int len,
int write, struct mem_attrib *mem,
struct target_ops *target)
{
DWORD done;
DWORD done = 0;
if (write)
{
DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08lx\n",
len, (DWORD) memaddr));
WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our,
len, &done);
if (!WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our,
len, &done))
done = 0;
FlushInstructionCache (current_process_handle, (LPCVOID) memaddr, len);
}
else
{
DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08lx\n",
len, (DWORD) memaddr));
ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our, len,
&done);
if (!ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our,
len, &done))
done = 0;
}
return done;
}