commit d4b014a1b48e326ac526877cd8697da283aaa479
author Lei Zhang <thestig@chromium.org> Wed May 22 02:10:46 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 22 02:10:46 2024 +0000
tree 3c97623bdbc029e7ee2f61ab1910fee781285b7d
parent 4ce737fdf669b7688a01490ffe37bf7c07a3530b

Avoid CPDF_String instantiation in FPDFAttachment_GetStringValue()

Instead of instantiating a CPDF_String to ultimately call
PDF_DecodeText(), just call PDF_DecodeText() directly.

Change-Id: I9d97927b96561f1239c42c18d5ee21cb79acd93c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/119411
Reviewed-by: Thomas Sepez <tsepez@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_attachment.cpp

diff --git a/fpdfsdk/fpdf_attachment.cpp b/fpdfsdk/fpdf_attachment.cpp
index 8c86b84..96434bf 100644
--- a/fpdfsdk/fpdf_attachment.cpp
+++ b/fpdfsdk/fpdf_attachment.cpp
@@ -200,8 +200,7 @@
       ByteString encoded =
           PDF_HexEncodeString(string_object->GetString().AsStringView());
       return Utf16EncodeMaybeCopyAndReturnLength(
-          pdfium::MakeRetain<CPDF_String>(nullptr, encoded)->GetUnicodeText(),
-          buffer_span);
+          PDF_DecodeText(encoded.unsigned_span()), buffer_span);
     }
   }