Snap for 9981223 from 13465c3acf0f54b612fe593dd96fe7680ffb3516 to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-release

Change-Id: If236638d61b41781ca786654ff0fc1c2d3f86b3b

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);