Skip to content

Memset should not be used for struct #4589

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
DiegoOst wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −32
Open

Memset should not be used for struct #4589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65a2410
Replace memset with more idiomatic C++ struct-initialization
DiegoOst Dec 20, 2025
d139c9f
tests: Remove redundant member initializations in FakeX11Resources
DiegoOst Dec 20, 2025
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
3 changes: 1 addition & 2 deletions src/common/dispatch/multiplexing_dispatchable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ void md::MultiplexingDispatchable::add_watch(std::shared_ptr<md::Dispatchable> c
reentrancy == DispatchReentrancy::sequential);
}

epoll_event e;
::memset(&e, 0, sizeof(e));
epoll_event e{};

e.events = fd_event_to_epoll(dispatchee->relevant_events());
if (reentrancy == DispatchReentrancy::sequential)
Expand Down
3 changes: 1 addition & 2 deletions src/platforms/common/server/kms-utils/threaded_drm_event_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ void mge::ThreadedDRMEventHandler::cancel_flip_events(KMSCrtcId id)

void mge::ThreadedDRMEventHandler::event_loop() noexcept
{
drmEventContext ctx;
::memset(&ctx, 0, sizeof(ctx));
drmEventContext ctx{};
ctx.version = 3;
ctx.page_flip_handler2 = &flip_handler;

Expand Down
3 changes: 1 addition & 2 deletions src/platforms/gbm-kms/server/kms/kms_page_flipper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ bool mgg::KMSPageFlipper::schedule_flip(uint32_t crtc_id,

mg::Frame mgg::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
{
drmEventContext evctx;
memset(&evctx, 0, sizeof evctx);
drmEventContext evctx{};
evctx.version = 2; // We only support the old v2 page_flip_handler
evctx.page_flip_handler = &page_flip_handler;

Expand Down
24 changes: 12 additions & 12 deletions tests/include/mir/test/doubles/mock_x11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@ class FakeX11Resources

Display *display;
Window window;
Screen screen;
XVisualInfo visual_info;
XEvent keypress_event_return = { 0 };
XEvent key_release_event_return = { 0 };
XEvent button_release_event_return = { 0 };
XEvent expose_event_return = { 0 };
XEvent focus_in_event_return = { 0 };
XEvent focus_out_event_return = { 0 };
XEvent vscroll_event_return = { 0 };
XEvent motion_event_return = { 0 };
XEvent enter_notify_event_return = { 0 };
XEvent leave_notify_event_return = { 0 };
Screen screen = {};
XVisualInfo visual_info = {};
XEvent keypress_event_return = {};
XEvent key_release_event_return = {};
XEvent button_release_event_return = {};
XEvent expose_event_return = {};
XEvent focus_in_event_return = {};
XEvent focus_out_event_return = {};
XEvent vscroll_event_return = {};
XEvent motion_event_return = {};
XEvent enter_notify_event_return = {};
XEvent leave_notify_event_return = {};
int pending_events = 1;
};

Expand Down
2 changes: 1 addition & 1 deletion tests/mir_test_doubles/mock_drm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ mtd::MockDRM::MockDRM()

global_mock = this;

memset(&empty_object_props, 0, sizeof(empty_object_props));
empty_object_props = {};

ON_CALL(*this, open(_,_))
.WillByDefault(
Expand Down
12 changes: 0 additions & 12 deletions tests/mir_test_doubles/mock_x11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@ mtd::FakeX11Resources::FakeX11Resources()
: display{reinterpret_cast<Display*>(0x12345678)},
window{reinterpret_cast<Window>((long unsigned int)9876543210)}
{
std::memset(&keypress_event_return, 0, sizeof(XEvent));
std::memset(&key_release_event_return, 0, sizeof(XEvent));
std::memset(&button_release_event_return, 0, sizeof(XEvent));
std::memset(&expose_event_return, 0, sizeof(XEvent));
std::memset(&focus_in_event_return, 0, sizeof(XEvent));
std::memset(&focus_out_event_return, 0, sizeof(XEvent));
std::memset(&vscroll_event_return, 0, sizeof(XEvent));
std::memset(&motion_event_return, 0, sizeof(XEvent));
std::memset(&enter_notify_event_return, 0, sizeof(XEvent));
std::memset(&leave_notify_event_return, 0, sizeof(XEvent));
std::memset(&visual_info, 0, sizeof(XVisualInfo));
std::memset(&screen, 0, sizeof screen);
visual_info.red_mask = 0xFF0000;
keypress_event_return.type = KeyPress;
key_release_event_return.type = KeyRelease;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit-tests/platforms/gbm-kms/kms-utils/test_drm_mode_resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class FakeDRMObjectsWithProperties
auto prop =
std::unique_ptr<drmModePropertyRes, void (*)(drmModePropertyPtr)>(new drmModePropertyRes, &::drmModeFreeProperty);

memset(prop.get(), 0, sizeof(*prop));
*prop = {};

prop->prop_id = id;
strncpy(prop->name, property.c_str(), sizeof(prop->name) - 1);
Expand Down