On 5 April 2016 at 15:46, Ed Maste <ema...@freebsd.org> wrote: > This is the same change as b55266b5 in linux-user. > > Signed-off-by: Ed Maste <ema...@freebsd.org> > --- > bsd-user/uaccess.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bsd-user/uaccess.c b/bsd-user/uaccess.c > index b7b3a06..91e2067 100644 > --- a/bsd-user/uaccess.c > +++ b/bsd-user/uaccess.c > @@ -51,7 +51,7 @@ abi_long target_strlen(abi_ulong guest_addr1) > ptr = lock_user(VERIFY_READ, guest_addr, max_len, 1); > if (!ptr) > return -TARGET_EFAULT; > - len = qemu_strnlen((char *)ptr, max_len); > + len = qemu_strnlen((const char *)ptr, max_len); > unlock_user(ptr, guest_addr, 0); > guest_addr += len; > /* we don't allow wrapping or integer overflow */ > -- > 2.4.6
Applied to master, thanks. -- PMM