diff options
| -rw-r--r-- | miasm/os_dep/win_api_x86_32.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/miasm/os_dep/win_api_x86_32.py b/miasm/os_dep/win_api_x86_32.py index a35da991..cc57fba2 100644 --- a/miasm/os_dep/win_api_x86_32.py +++ b/miasm/os_dep/win_api_x86_32.py @@ -1681,7 +1681,20 @@ def kernel32_MultiByteToWideChar(jitter): "cchwidechar"]) if args.codepage != CP_ACP and args.codepage != CP_1252: raise NotImplementedError - src = jitter.vm.get_mem(args.lpmultibytestr, args.cbmultibyte) + # according to MSDN: + # "Note that, if cbMultiByte is 0, the function fails." + if args.cbmultibyte == 0: + raise ValueError + # according to MSDN: + # "Alternatively, this parameter can be set to -1 if the string is + # null-terminated." + if args.cbmultibyte == 0xffffffff: + src_len = 0 + while jitter.vm.get_mem(args.lpmultibytestr + src_len, 1) != b'\0': + src_len += 1 + src = jitter.vm.get_mem(args.lpmultibytestr, src_len) + else: + src = jitter.vm.get_mem(args.lpmultibytestr, args.cbmultibyte) if args.dwflags & MB_ERR_INVALID_CHARS: # will raise an exception if decoding fails s = src.decode("cp1252", errors="replace").encode("utf-16le") |