admin/hakril-PythonForWindows
1
0
Fork 0
mirror of https://github.com/hakril/PythonForWindows synced 2026-06-08 14:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed current_process.read_string/wstring for page end + tests

Browse Source
This commit is contained in:
clement rouault
2021-06-22 19:03:35 +02:00
parent 6552312275
commit fb9ff96a11
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_process.py
+34 -7
View File
@@ -105,12 +105,14 @@ class TestProcessWithCheckGarbage(object):
string_to_write = test_string + "\x00"
with proc32_64.allocated_memory(0x1000) as addr:
waddr = addr + 0x1000 - len(string_to_write)
proc32_64.write_memory(addr, string_to_write)
assert proc32_64.read_string(addr) == test_string
proc32_64.write_memory(waddr, string_to_write)
with pytest.raises(windows.winproxy.WinproxyError):
proc32_64.read_memory(waddr, 0x20) # Check that Reading dumbly fails
assert proc32_64.read_string(waddr) == test_string
def test_wread_string(self, proc32_64):
test_string = "TEST_STRING"
test_string = u"TEST_STRING"
string_to_write = test_string + "\x00"
with proc32_64.allocated_memory(0x1000) as addr:
# Just check based on previous 'encoding' method
@@ -118,12 +120,37 @@ class TestProcessWithCheckGarbage(object):
assert proc32_64.read_wstring(addr) == test_string
def test_read_wstring_end_page(self, proc32_64):
test_string = "TEST_STRING"
string_to_write = test_string + "\x00"
test_string = u"TEST_STRING"
string_to_write = (test_string + "\x00").encode("utf-16-le")
with proc32_64.allocated_memory(0x1000) as addr:
waddr = addr + 0x1000 - len(string_to_write)
proc32_64.write_memory(addr, "\x00".join(string_to_write))
assert proc32_64.read_wstring(addr) == test_string
proc32_64.write_memory(waddr, string_to_write)
with pytest.raises(windows.winproxy.WinproxyError):
proc32_64.read_memory(waddr, 0x20) # Check that Reading dumbly fails
assert proc32_64.read_wstring(waddr) == test_string
def test_read_string_end_page_current_process(self):
current_proc = windows.current_process
test_string = "TEST_STRING"
string_to_write = test_string + "\x00"
with current_proc.allocated_memory(0x1000) as addr:
waddr = addr + 0x1000 - len(string_to_write)
current_proc.write_memory(waddr, string_to_write)
with pytest.raises(WindowsError):
current_proc.read_memory(waddr, 0x20) # Check that Reading dumbly fails
assert current_proc.read_string(waddr) == test_string
def test_read_wstring_end_page_current_process(self):
current_proc = windows.current_process
test_string = u"TEST_STRING"
string_to_write = (test_string + "\x00").encode("utf-16-le")
with current_proc.allocated_memory(0x1000) as addr:
waddr = addr + 0x1000 - len(string_to_write)
current_proc.write_memory(waddr, string_to_write)
with pytest.raises(WindowsError):
current_proc.read_memory(waddr, 0x20) # Check that Reading dumbly fails
assert current_proc.read_wstring(waddr) == test_string
def test_query_memory(self, proc32_64):
addr = proc32_64.virtual_alloc(0x2000, prot=gdef.PAGE_EXECUTE_READWRITE)
windows/winobject/process.py
+7 -1
View File
@@ -730,7 +730,13 @@ class CurrentProcess(Process):
raise ValueError("Not a syswow process")
return windows.syswow64.get_current_process_syswow_peb()
# TODO: use ctypes.string_ad / ctypes.wstring_at for read_string / read_wstring ?
# TODO: use ctypes.string_at / ctypes.wstring_at for read_string / read_wstring ?
def read_string(self, addr):
return ctypes.string_at(addr) # Raises WindowsError on fail
def read_wstring(self, addr):
return ctypes.wstring_at(addr) # Raises WindowsError on fail
class WinThread(Thread):
"""Represent a thread """