From 0733a1b6a1c3f1d2907f85e823b1b9674322d97b Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 31 Aug 2017 12:36:31 -0700
Subject: Change FPDFImageObj_GetImageFilter() to return byte strings.

Since the returned data is a key, it should be a byte string and not a
wide string.

Change-Id: I9243d88586ea5b13c4b6556479d17316bf07e32e
Reviewed-on: https://pdfium-review.googlesource.com/12710
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
---
 fpdfsdk/fpdfedit_embeddertest.cpp | 24 ++++++++++++------------
 fpdfsdk/fpdfeditimg.cpp           | 11 +++++++----
 2 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'fpdfsdk')

diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp
index 6dc177e2b5..71933fea43 100644
--- a/fpdfsdk/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdfedit_embeddertest.cpp
@@ -1056,10 +1056,10 @@ TEST_F(FPDFEditEmbeddertest, GetImageFilters) {
   ASSERT_EQ(1, FPDFImageObj_GetImageFilterCount(obj));
   unsigned long len = FPDFImageObj_GetImageFilter(obj, 0, nullptr, 0);
   std::vector<char> buf(len);
-  EXPECT_EQ(24u, FPDFImageObj_GetImageFilter(obj, 0, buf.data(), len));
-  EXPECT_STREQ(L"FlateDecode",
-               GetPlatformWString(reinterpret_cast<unsigned short*>(buf.data()))
-                   .c_str());
+  static constexpr char kFlateDecode[] = "FlateDecode";
+  EXPECT_EQ(sizeof(kFlateDecode),
+            FPDFImageObj_GetImageFilter(obj, 0, buf.data(), len));
+  EXPECT_STREQ(kFlateDecode, buf.data());
   EXPECT_EQ(0u, FPDFImageObj_GetImageFilter(obj, 1, nullptr, 0));
 
   // Verify all the filters for an image object with a list of filters.
@@ -1069,18 +1069,18 @@ TEST_F(FPDFEditEmbeddertest, GetImageFilters) {
   len = FPDFImageObj_GetImageFilter(obj, 0, nullptr, 0);
   buf.clear();
   buf.resize(len);
-  EXPECT_EQ(30u, FPDFImageObj_GetImageFilter(obj, 0, buf.data(), len));
-  EXPECT_STREQ(L"ASCIIHexDecode",
-               GetPlatformWString(reinterpret_cast<unsigned short*>(buf.data()))
-                   .c_str());
+  static constexpr char kASCIIHexDecode[] = "ASCIIHexDecode";
+  EXPECT_EQ(sizeof(kASCIIHexDecode),
+            FPDFImageObj_GetImageFilter(obj, 0, buf.data(), len));
+  EXPECT_STREQ(kASCIIHexDecode, buf.data());
 
   len = FPDFImageObj_GetImageFilter(obj, 1, nullptr, 0);
   buf.clear();
   buf.resize(len);
-  EXPECT_EQ(20u, FPDFImageObj_GetImageFilter(obj, 1, buf.data(), len));
-  EXPECT_STREQ(L"DCTDecode",
-               GetPlatformWString(reinterpret_cast<unsigned short*>(buf.data()))
-                   .c_str());
+  static constexpr char kDCTDecode[] = "DCTDecode";
+  EXPECT_EQ(sizeof(kDCTDecode),
+            FPDFImageObj_GetImageFilter(obj, 1, buf.data(), len));
+  EXPECT_STREQ(kDCTDecode, buf.data());
 
   UnloadPage(page);
 }
diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp
index 662ad23d76..5e3191635e 100644
--- a/fpdfsdk/fpdfeditimg.cpp
+++ b/fpdfsdk/fpdfeditimg.cpp
@@ -244,13 +244,16 @@ FPDFImageObj_GetImageFilter(FPDF_PAGEOBJECT image_object,
   CPDF_PageObject* pObj = CPDFPageObjectFromFPDFPageObject(image_object);
   CPDF_Object* pFilter =
       pObj->AsImage()->GetImage()->GetDict()->GetDirectObjectFor("Filter");
-  CFX_WideString wsFilters;
+  CFX_ByteString bsFilter;
   if (pFilter->IsName())
-    wsFilters = pFilter->AsName()->GetUnicodeText();
+    bsFilter = pFilter->AsName()->GetString();
   else
-    wsFilters = pFilter->AsArray()->GetUnicodeTextAt(index);
+    bsFilter = pFilter->AsArray()->GetStringAt(index);
 
-  return Utf16EncodeMaybeCopyAndReturnLength(wsFilters, buffer, buflen);
+  unsigned long len = bsFilter.GetLength() + 1;
+  if (buffer && len <= buflen)
+    memcpy(buffer, bsFilter.c_str(), len);
+  return len;
 }
 
 FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
-- 
cgit v1.2.3