diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-20 23:12:27 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-20 23:12:27 +0000 |
commit | b557e4b05c393902e4fed9e68a93a9518bbf6d7d (patch) | |
tree | d4e95b4855b772d7cf850fb6ab34420b47f7d803 | |
parent | 283275be6212e3501f34fab48d11ff2bd9cb9e48 (diff) | |
parent | 9277a94aefe24518b75eba1d106542ef4b3a39cc (diff) | |
download | pdfium-android14-d1-s1-release.tar.gz |
Snap for 9982304 from 9277a94aefe24518b75eba1d106542ef4b3a39cc to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release
Change-Id: I3142a91c8157019e10927bc4fe4ca93a1fca37de
-rw-r--r-- | core/fxcrt/widestring.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/fxcrt/widestring.cpp b/core/fxcrt/widestring.cpp index 10a31c3fa..4e51a85d9 100644 --- a/core/fxcrt/widestring.cpp +++ b/core/fxcrt/widestring.cpp @@ -287,18 +287,13 @@ static_assert(sizeof(WideString) <= sizeof(wchar_t*), WideString WideString::FormatV(const wchar_t* format, va_list argList) { va_list argListCopy; va_copy(argListCopy, argList); - int maxLen = vswprintf(nullptr, 0, format, argListCopy); + auto guess = GuessSizeForVSWPrintf(format, argListCopy); va_end(argListCopy); - if (maxLen <= 0) { - va_copy(argListCopy, argList); - auto guess = GuessSizeForVSWPrintf(format, argListCopy); - va_end(argListCopy); - - if (!guess.has_value()) - return WideString(); - maxLen = pdfium::base::checked_cast<int>(guess.value()); + if (!guess.has_value()) { + return WideString(); } + int maxLen = pdfium::base::checked_cast<int>(guess.value()); while (maxLen < 32 * 1024) { va_copy(argListCopy, argList); |