From de0e1bddffbb26a6ffb9bf7152c4f475a4c07d49 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 30 Jan 2025 07:30:51 +0000 Subject: [PATCH] [hvgl] Minor simplify sanitize --- src/hb-aat-var-hvgl-table.hh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hb-aat-var-hvgl-table.hh b/src/hb-aat-var-hvgl-table.hh index f305b8a0e..60ae4a418 100644 --- a/src/hb-aat-var-hvgl-table.hh +++ b/src/hb-aat-var-hvgl-table.hh @@ -342,15 +342,14 @@ struct PartComposite if (unlikely (!c->check_struct (this))) return_trace (false); const auto &subParts = StructAtOffset (this, subPartsOff4 * 4); - if (unlikely (!subParts.sanitize (c, subPartCount))) return_trace (false); - const auto &extremumColumnStarts = StructAtOffset (this, extremumColumnStartsOff4 * 4); const auto &masterAxisValueDeltas = StructAtOffset (this, masterAxisValueDeltasOff4 * 4); const auto &extremumAxisValueDeltas = StructAtOffset (this, extremumAxisValueDeltasOff4 * 4); const auto &allTranslations = StructAtOffset (this, allTranslationsOff4 * 4); const auto &allRotations = StructAtOffset (this, allRotationsOff4 * 4); - return_trace (likely (extremumColumnStarts.sanitize (c, axisCount, sparseMasterAxisValueCount, sparseExtremumAxisValueCount) && + return_trace (likely (subParts.sanitize (c, subPartCount) && + extremumColumnStarts.sanitize (c, axisCount, sparseMasterAxisValueCount, sparseExtremumAxisValueCount) && masterAxisValueDeltas.sanitize (c, sparseMasterAxisValueCount) && extremumAxisValueDeltas.sanitize (c, sparseExtremumAxisValueCount) && allTranslations.sanitize (c, sparseMasterTranslationCount, sparseExtremumTranslationCount) &&