diff options
Diffstat (limited to '')
| -rw-r--r-- | miasm2/os_dep/linux_stdlib.py | 12 | ||||
| -rw-r--r-- | miasm2/os_dep/win_api_x86_32.py | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/miasm2/os_dep/linux_stdlib.py b/miasm2/os_dep/linux_stdlib.py index 9dbc6c60..57424995 100644 --- a/miasm2/os_dep/linux_stdlib.py +++ b/miasm2/os_dep/linux_stdlib.py @@ -54,18 +54,18 @@ def xxx_snprintf(jitter): writes to string str according to format format and at most size bytes. ''' - ret_addr, (str, size, format) = jitter.func_args_stdcall(3) + ret_addr, (string, size, fmt) = jitter.func_args_stdcall(3) curarg, output = 3, '' while True: - c = jitter.vm.get_mem(format, 1) - format += 1 + c = jitter.vm.get_mem(fmt, 1) + fmt += 1 if c == '\x00': break if c == '%': token = '%' while True: - c = jitter.vm.get_mem(format, 1) - format += 1 + c = jitter.vm.get_mem(fmt, 1) + fmt += 1 token += c if c in '%cdfsux': break @@ -74,5 +74,5 @@ def xxx_snprintf(jitter): output += c output = output[:size - 1] ret = len(output) - jitter.vm.set_mem(str, output + '\x00') + jitter.vm.set_mem(string, output + '\x00') return jitter.func_ret_stdcall(ret_addr, ret) diff --git a/miasm2/os_dep/win_api_x86_32.py b/miasm2/os_dep/win_api_x86_32.py index e47c6024..cac03905 100644 --- a/miasm2/os_dep/win_api_x86_32.py +++ b/miasm2/os_dep/win_api_x86_32.py @@ -561,7 +561,7 @@ def kernel32_CreateFile(jitter, funcname, get_str): if stat.S_ISDIR(s.st_mode): ret = winobjs.handle_pool.add(f, 0x1337) else: - h = open(f, 'rb+') + h = open(f, 'r+b') ret = winobjs.handle_pool.add(f, h) else: log.warning("FILE %r DOES NOT EXIST!" % fname) @@ -573,7 +573,7 @@ def kernel32_CreateFile(jitter, funcname, get_str): winobjs.lastwin32error = 80 else: open(f, 'w') - h = open(f, 'rb+') + h = open(f, 'r+b') ret = winobjs.handle_pool.add(f, h) elif args.dwcreationdisposition == 4: # open_always @@ -582,7 +582,7 @@ def kernel32_CreateFile(jitter, funcname, get_str): if stat.S_ISDIR(s.st_mode): ret = winobjs.handle_pool.add(f, 0x1337) else: - h = open(f, 'rb+') + h = open(f, 'r+b') ret = winobjs.handle_pool.add(f, h) else: raise NotImplementedError("Untested case") @@ -601,7 +601,7 @@ def kernel32_CreateFile(jitter, funcname, get_str): # open dir ret = winobjs.handle_pool.add(f, 0x1337) else: - h = open(f, 'rb+') + h = open(f, 'r+b') ret = winobjs.handle_pool.add(f, h) else: raise NotImplementedError("Untested case") # to test |