Skip to content

MDEV-36344: UBSAN DsMrr_impl::dsmrr_init on null ptr #5016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grooverdan wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Open

MDEV-36344: UBSAN DsMrr_impl::dsmrr_init on null ptr #5016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion sql/multi_range_read.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,14 +1193,16 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
buf_manager.reset_buffer_sizes= reset_buffer_sizes;
buf_manager.redistribute_buffer_space= redistribute_buffer_space;
}
else
else if (full_buf)
{
/* index strategy doesn't need buffer, give all space to rowids*/
rowid_buffer.set_buffer_space(full_buf, full_buf_end);
if (!rowid_buffer.have_space_for(primary_file->ref_length +
(int)is_mrr_assoc * sizeof(range_id_t)))
goto use_default_impl;
}
else
goto use_default_impl;

// setup_two_handlers() will call dsmrr_close() will clears the filter.
// Save its value and restore afterwards.
Expand Down