[subset] Reject malformed normalized axis ranges

Reject invalid normalized axis triples during subset plan
construction so malformed avar remapping does not reach tuple
instancing.

Keep a defensive guard in the instancer solver as a backstop
against future bad callers.

Tested:
- ./build/src/test-instancer-solver
- ./build/src/test-item-varstore
- ./build/src/test-tuple-varstore

Fixes: https://oss-fuzz.com/testcase-detail/6119821501857792
Assisted-by: OpenAI Codex
This commit is contained in:
Behdad Esfahbod authored and Garret Rieger committed 2026-03-10 11:58:52 -06:00
1 parent 3d369f5144
commit bc4bbced05
3 files changed
+43 -9

No files matched your search

+13 -3
View File
@@ -407,9 +407,19 @@ rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distance
rebase_tent_result_t &out,
rebase_tent_result_t &scratch)
{
assert (-1.0 <= axisLimit.minimum && axisLimit.minimum <= axisLimit.middle && axisLimit.middle <= axisLimit.maximum && axisLimit.maximum <= +1.0);
assert (-2.0 <= tent.minimum && tent.minimum <= tent.middle && tent.middle <= tent.maximum && tent.maximum <= +2.0);
assert (tent.middle != 0.0);
if (unlikely (!(-1.0 <= axisLimit.minimum &&
axisLimit.minimum <= axisLimit.middle &&
axisLimit.middle <= axisLimit.maximum &&
axisLimit.maximum <= +1.0) ||
!(-2.0 <= tent.minimum &&
tent.minimum <= tent.middle &&
tent.middle <= tent.maximum &&
tent.maximum <= +2.0) ||
tent.middle == 0.0))
{
out.reset ();
return;
}
rebase_tent_result_t &sols = scratch;
_solve (tent, axisLimit, sols);
+21 -6
View File
@@ -36,6 +36,15 @@
#ifndef HB_NO_VAR
static inline bool
_is_valid_normalized_axis_range (const Triple &range)
{
return -1.0 <= range.minimum &&
range.minimum <= range.middle &&
range.middle <= range.maximum &&
range.maximum <= +1.0;
}
void
generate_varstore_inner_maps (const hb_set_t& varidx_set,
unsigned subtable_count,
@@ -232,9 +241,12 @@ normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
}
else
{
plan->axes_location.set (axis_tag, Triple ((double) normalized_min,
(double) normalized_default,
(double) normalized_max));
Triple normalized_range ((double) normalized_min,
(double) normalized_default,
(double) normalized_max);
if (unlikely (!_is_valid_normalized_axis_range (normalized_range)))
return false;
plan->axes_location.set (axis_tag, normalized_range);
if (normalized_default == -0.f)
normalized_default = 0.f; // Normalize -0 to 0
if (normalized_default != 0.f)
@@ -269,9 +281,12 @@ normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
hb_tag_t axis_tag = _.second.get_axis_tag ();
if (plan->user_axes_location.has (axis_tag))
{
plan->axes_location.set (axis_tag, Triple ((double) normalized_mins[i],
(double) normalized_defaults[i],
(double) normalized_maxs[i]));
Triple normalized_range ((double) normalized_mins[i],
(double) normalized_defaults[i],
(double) normalized_maxs[i]);
if (unlikely (!_is_valid_normalized_axis_range (normalized_range)))
return false;
plan->axes_location.set (axis_tag, normalized_range);
float normalized_default = normalized_defaults[i];
if (normalized_default == -0.f)
normalized_default = 0.f; // Normalize -0 to 0
+9
View File
@@ -73,6 +73,15 @@ main (int argc, char **argv)
hb_always_assert (out.length == 0);
}
{
/* malformed axis range should be rejected, not abort */
Triple tent (0.3, 0.5, 0.8);
Triple axis_range (0.4, 0.2, 0.3);
rebase_tent_result_t out, scratch;
rebase_tent (tent, axis_range, default_axis_distances, out, scratch);
hb_always_assert (out.length == 0);
}
/* Case 2 */
{
Triple tent (0.0, 1.0, 1.0);