From bb0f2f976885693952f4412d0740ea14542d3d1a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 27 Jan 2021 18:29:57 +0100
Subject: [PATCH] Fix endptr output value in android_wcstoxxx()

These functions incorrectly multiplied an increment of wchar_t pointer
by sizeof(wchar_t), which made the result quite wrong, so just don't do
this.

See 744ea8a618 (For Android (wxQT), add private wcstol, wcstoul and
wcstod, 2015-02-11).
---
 src/common/wxcrt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index c131cec80d..8437ce6ff6 100644
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -1256,7 +1256,7 @@ int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap)
 #define ANDROID_WCSTO_END \
     if(endptr) { \
         if(dstendp) \
-            *endptr = (wchar_t*)(nptr + (dstendp - dst) * sizeof(wchar_t)); \
+            *endptr = (wchar_t*)(nptr + (dstendp - dst)); \
         else \
             *endptr = NULL; \
     } \