summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-04-27 20:11:18 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-04-27 20:11:18 +0000
commit7b8cd8dafb4bdd98874ec4716d7e8e049a596e11 (patch)
treea9107e511d8c1ded8735149c6961139910519e44
parenta1666b8e536e90a4cc21787fe12c95e052454b6d (diff)
downloadpdfium-7b8cd8dafb4bdd98874ec4716d7e8e049a596e11.tar.xz
Provide double-byte terminator in Windows font variant name.chromium/3396
When parsing UTF16-LE, the default trailing "\0" from a single-byte character literal isn't suffucient. TBR=dsinclair@chromium.org Bug: 835184 Change-Id: Ie7db53262adbec0ebccb5d0b22752b8c9f5e6229 Reviewed-on: https://pdfium-review.googlesource.com/31191 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org> (cherry picked from commit 9f71afb882a9d1294f8a4392b8553e2c285f51c7) Reviewed-on: https://pdfium-review.googlesource.com/31630 Reviewed-by: Tom Sepez <tsepez@chromium.org>
-rw-r--r--core/fxge/win32/fx_win32_device.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index 337f9643d1..4047866412 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -38,9 +38,9 @@ namespace {
const struct {
const char* m_pFaceName;
- const char* m_pVariantName;
+ const char* m_pVariantName; // Note: UTF16-LE terminator required.
} g_VariantNames[] = {
- {"DFKai-SB", "\x19\x6A\x77\x69\xD4\x9A"},
+ {"DFKai-SB", "\x19\x6A\x77\x69\xD4\x9A\x00\x00"},
};
const struct {