From d8738b1b0f10e2f70ac69c3e3dbf10e496c8a67f Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Fri, 25 Oct 2013 14:28:52 +0300 Subject: Fix #193 (use RtlMoveMemory instead of msvcrt.memcpy) --- paramiko/_winapi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/paramiko/_winapi.py b/paramiko/_winapi.py index f141b005..9af8adde 100644 --- a/paramiko/_winapi.py +++ b/paramiko/_winapi.py @@ -81,9 +81,6 @@ def handle_nonzero_success(result): raise WindowsError() -##################### -# jaraco.windows.mmap - CreateFileMapping = ctypes.windll.kernel32.CreateFileMappingW CreateFileMapping.argtypes = [ ctypes.wintypes.HANDLE, @@ -130,15 +127,18 @@ class MemoryMap(object): self.pos = pos def write(self, msg): - ctypes.windll.msvcrt.memcpy(self.view + self.pos, msg, len(msg)) - self.pos += len(msg) + n = len(msg) + if self.pos + n >= self.length: # A little safety. + raise ValueError("Refusing to write %d bytes" % n) + ctypes.windll.kernel32.RtlMoveMemory(self.view + self.pos, msg, n) + self.pos += n def read(self, n): """ Read n bytes from mapped view. """ out = ctypes.create_string_buffer(n) - ctypes.windll.msvcrt.memcpy(out, self.view + self.pos, n) + ctypes.windll.kernel32.RtlMoveMemory(out, self.view + self.pos, n) self.pos += n return out.raw -- cgit v1.2.3