about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorHugo Porcher <hugo.r.porcher@gmail.com>2020-06-02 16:02:14 +0200
committerHugo Porcher <hugo.r.porcher@gmail.com>2020-06-02 16:02:14 +0200
commit4f0a824b36ef56a3844c486a877732a96017de12 (patch)
tree883cb87e8abc15606fbf0b500ecc3648013071cf
parent9f052f39ca4c72c1b6146d445f7764c57876013a (diff)
downloadmiasm-4f0a824b36ef56a3844c486a877732a96017de12.tar.gz
miasm-4f0a824b36ef56a3844c486a877732a96017de12.zip
Fix type error in msvcrt_wcsrchr and msvcrt_strrchr
-rw-r--r--miasm/os_dep/win_api_x86_32.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm/os_dep/win_api_x86_32.py b/miasm/os_dep/win_api_x86_32.py
index c1870d97..6fb654d7 100644
--- a/miasm/os_dep/win_api_x86_32.py
+++ b/miasm/os_dep/win_api_x86_32.py
@@ -1911,7 +1911,7 @@ def msvcrt_memset(jitter):
 def msvcrt_strrchr(jitter):
     ret_ad, args = jitter.func_args_cdecl(['pstr','c'])
     s = get_win_str_a(jitter, args.pstr)
-    c = int_to_byte(args.c)
+    c = int_to_byte(args.c).decode()
     ret = args.pstr + s.rfind(c)
     log.info("strrchr(%x '%s','%s') = %x" % (args.pstr,s,c,ret))
     jitter.func_ret_cdecl(ret_ad, ret)
@@ -1919,7 +1919,7 @@ def msvcrt_strrchr(jitter):
 def msvcrt_wcsrchr(jitter):
     ret_ad, args = jitter.func_args_cdecl(['pstr','c'])
     s = get_win_str_w(jitter, args.pstr)
-    c = int_to_byte(args.c)
+    c = int_to_byte(args.c).decode()
     ret = args.pstr + (s.rfind(c)*2)
     log.info("wcsrchr(%x '%s',%s) = %x" % (args.pstr,s,c,ret))
     jitter.func_ret_cdecl(ret_ad, ret)