diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index 2777c659d..fa08140f5 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -1545,6 +1545,7 @@ struct ClassDefFormat2
     range_rec.value = prev_klass;
 
     RangeRecord *record = c->copy (range_rec);
+    if (unlikely (!record)) return_trace (false);
 
     for (const auto gid_klass_pair : + (++it))
     {
@@ -1554,6 +1555,7 @@ struct ClassDefFormat2
       if (cur_gid != prev_gid + 1 ||
           cur_klass != prev_klass)
       {
+        if (unlikely (!record)) break;
         record->end = prev_gid;
         num_ranges++;
 
@@ -1568,7 +1570,7 @@ struct ClassDefFormat2
       prev_gid = cur_gid;
     }
 
-    record->end = prev_gid;
+    if (likely (record)) record->end = prev_gid;
     rangeRecord.len = num_ranges;
     return_trace (true);
   }
diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5659903036751872 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5659903036751872
new file mode 100644
index 000000000..51ab2fe43
Binary files /dev/null and b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5659903036751872 differ