From 4422f4dd941628ad289bcabc75fbd788d37415f6 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@google.com>
Date: Fri, 11 Jul 2014 11:30:06 -0400
Subject: Don't pass invalid Unicode codepoint to Skia

Bug: 15849380
Change-Id: Ib5285e57c5806bd399600fadd56e8bc809da323f
---
 libs/minikin/Layout.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libs')

diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 01b6599..21b8362 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -258,6 +258,12 @@ static hb_bool_t harfbuzzGetGlyph(hb_font_t* hbFont, void* fontData, hb_codepoin
     MinikinPaint* paint = reinterpret_cast<MinikinPaint*>(fontData);
     MinikinFont* font = paint->font;
     uint32_t glyph_id;
+    /* HarfBuzz replaces broken input codepoints with (unsigned int) -1.
+     * Skia expects valid Unicode.
+     * Replace invalid codepoints with U+FFFD REPLACEMENT CHARACTER.
+     */
+    if (unicode > 0x10FFFF)
+        unicode = 0xFFFD;
     bool ok = font->GetGlyph(unicode, &glyph_id);
     if (ok) {
         *glyph = glyph_id;
-- 
cgit v1.2.3