Skip to content
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.

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

fix memory leak in z_declare_subscriber #262

Merged
merged 5 commits into from
Oct 18, 2023
Merged

fix memory leak in z_declare_subscriber #262

merged 5 commits into from
Oct 18, 2023

Conversation

p-avital
Copy link
Contributor

fixes #259

@p-avital p-avital requested a review from cguimaraes October 12, 2023 15:51
Copy link
Member

@cguimaraes cguimaraes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a quick look seems good.
But I suggest you to run valgrind on the z_client_test at least.

@hwoithe
Copy link

hwoithe commented Oct 12, 2023

Although not necessary to fix the memory leak issue, this is one of the few places where the result of z_malloc is not checked.

Thank you very much for the fix.

Copy link
Member

@cguimaraes cguimaraes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. But have a look at the inline comment.

src/api/api.c Show resolved Hide resolved
src/api/api.c Outdated
suffix[len] = 0;
keyexpr._suffix = suffix;
_z_keyexpr_set_owns_suffix(&keyexpr, false);
}
}
uint16_t id = _z_declare_resource(zs._val, keyexpr);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is declared if suffix allocation fails? It seems that it will declare a keyexpr with id but no suffix...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will declare the exact keyexpr that was passed to the subscriber, but will keep the wild suffix, so the bug is not the one you expected, but it is buggy

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually was a bug, but not the one you expected. Let's just cancel attempting to declare the resource if we failed to allocate for the suffix, the other steps would probably also fail anyway.

@p-avital p-avital merged commit 5fff227 into master Oct 18, 2023
43 checks passed
@cguimaraes cguimaraes deleted the fix-259 branch October 18, 2023 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] z_sub example leaks allocated suffix in z_declare_subscriber
3 participants