commit 6c80a9d4b06e10a2865731c487a537d34963268a
author halcanary <halcanary@google.com> Tue Aug 16 11:54:57 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 16 11:54:58 2016 -0700
tree 694ea8778d8896e2cb6b92692b035fbf89279104
parent 28c6d83c98473a24b8d0b0d279c43fd37ff24055

SkPDF: Font names need escaping

NOTRY=true

Review-Url: https://codereview.chromium.org/2250763002

src/pdf/SkPDFFont.cpp

diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 6d8f09c..5cc80b0 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -756,7 +756,7 @@
     SkAdvancedTypefaceMetrics::FontType type = this->getType();
     SkTypeface* face = this->typeface();
     SkASSERT(face);
-    const char* name = metrics.fFontName.c_str();
+    const SkString& name = metrics.fFontName;
 
     auto descriptor = sk_make_sp<SkPDFDict>("FontDescriptor");
     add_common_font_descriptor_entries(descriptor.get(), metrics, 0);
@@ -785,7 +785,7 @@
                     subset->exportTo(&glyphIDs);
                 }
                 sk_sp<SkPDFObject> subsetStream = get_subset_font_stream(
-                        std::move(fontAsset), glyphIDs, name);
+                        std::move(fontAsset), glyphIDs, name.c_str());
                 if (subsetStream) {
                     descriptor->insertObjRef("FontFile2", std::move(subsetStream));
                     break;