From: Ebrahim Byagowi Date: Wed, 10 Jul 2019 21:05:06 +0000 (+0430) Subject: Fix unintialized memory read in cmap subset (#1826) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a9d643c297990f9889a2f7b4a470ef933bac131;p=platform%2Fupstream%2FlibHarfBuzzSharp.git Fix unintialized memory read in cmap subset (#1826) --- diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index ac75bd9..d79b549 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -878,7 +878,7 @@ struct cmap cmap_plan->has_ms_bmp = find_subtable (3, 1); cmap_plan->has_ms_ucs4 = find_subtable (3, 10); cmap_plan->num_enc_records = cmap_plan->has_unicode_bmp + cmap_plan->has_unicode_ucs4 + cmap_plan->has_ms_bmp + cmap_plan->has_ms_ucs4; - + if (unlikely (!CmapSubtableFormat4::create_sub_table_plan (plan, &cmap_plan->format4_segments))) return false; @@ -979,6 +979,14 @@ struct cmap if (unlikely (!format12.serialize (&c, cmap_subset_plan.format12_groups))) return false; } + else + { + // FIXME: Merge this with above or, remove and tweak #final_size + // and rebase all the tests expectations + HBUINT32 empty; + empty = 0; + for (unsigned int i = 0; i < 4; ++i) c.copy (empty); + } c.end_serialize ();