rec_get_nth_def_field(): Avoid out-of-bounds access

9717f982 · Marko Mäkelä · 16671b41 · 9717f982
Commit 9717f982 authored Oct 02, 2018 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.h +2 -1

No files found.
--- a/storage/innobase/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
@@ -839,7 +839,8 @@ rec_get_nth_def_field(
 	ulint*			len)
 {
 	ut_ad(rec_offs_validate(rec, index, offsets));
-	if (!rec_offs_nth_default(offsets, n)) {
+	if (rec_offs_n_fields(offsets) > n
+	    && !rec_offs_nth_default(offsets, n)) {
 		return rec_get_nth_field(rec, offsets, n, len);
 	}