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

Jump to bottom

Fix some misc mem leaks in error paths #7065

Closed
wants to merge 2 commits into from
Closed

Fix some misc mem leaks in error paths #7065

wants to merge 2 commits into from

Conversation

mattcaswell
Copy link
Member

Fixes a mem leak in the PSK code, and two in s_server. The s_server leaks will also be cherry-picked to 1.1.0 (the PSK issue only affects master).

Fixes #7060
Fixes #7061

@mattcaswell
Fix a mem leak on error in the PSK code
dbec93a 
Thanks to @fangang190 for reporting this issue.

Fixes openssl#7060
@mattcaswell
Free SSL object on an error path
4b2cb93 
Thanks to @fangang190 for reporting this

Fixes openssl#7061
@mattcaswell mattcaswell added branch: master Merge to master branch 1.1.0 branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch labels Aug 27, 2018
@InfoHunter InfoHunter mentioned this pull request Aug 27, 2018
Closed
InfoHunter
InfoHunter approved these changes Aug 27, 2018
View reviewed changes
Copy link
Member

@InfoHunter InfoHunter left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@romen romen added the approval: done This pull request has the required number of approvals label Aug 28, 2018
@InfoHunter
Copy link
Member

Hi Matt, considering you are busy on the meetings in Australia, I merged this fix - both on master (67afcfd, c2cb1a1) and 1.1.0 branch (eeee521). This leak in s3_lib.c has not affected 1.1.0 so only the first commit is cherry-picked to 1.1.0.

levitte pushed a commit that referenced this pull request Aug 30, 2018
@mattcaswell @InfoHunter
Free SSL object on an error path
eeee521 
Thanks to @fangang190 for reporting this

Fixes #7061

Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from #7065)
levitte pushed a commit that referenced this pull request Aug 30, 2018
@mattcaswell @InfoHunter
Fix a mem leak on error in the PSK code
c2cb1a1 
Thanks to @fangang190 for reporting this issue.

Fixes #7060

Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from #7065)
levitte pushed a commit that referenced this pull request Aug 30, 2018
@mattcaswell @InfoHunter
Free SSL object on an error path
67afcfd 
Thanks to @fangang190 for reporting this

Fixes #7061

Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from #7065)
@InfoHunter
Copy link
Member

Merged, closing

@InfoHunter InfoHunter closed this Aug 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@InfoHunter InfoHunter InfoHunter approved these changes

Assignees
No one assigned
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mattcaswell @InfoHunter @romen