-
Notifications
You must be signed in to change notification settings - Fork 62
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 hg_proc_save_ptr() error handling and allocation (when using XDR) #779
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
soumagne
reviewed
Jan 29, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the patch, that looks good. I just made some minor fixes to match the formatting.
thanks, I rebased the formatting changes in! |
@chuckcranor could you please amend your commit message to just start the first line with |
hg_proc_hg_bulk_t() uses hg_proc_save_ptr() to allocate buffer space for encoding/decoding bulk handles, but it does not check the return value of hg_proc_save_ptr(). hg_proc_save_ptr() returns NULL on memory allocation failure. update hg_proc_hg_bulk_t() to check the return value of hg_proc_save_ptr() to see if it is NULL. Update hg_proc_save_ptr(): When hg_proc_save_ptr() is compiled with !HG_HAS_XDR we should check the return value of hg_proc_set_size() for resize errors and fail if hg_proc_set_size() fails. When hg_proc_save_ptr() is compiled with HG_HAS_XDR, we should follow the XDR BYTES_PER_XDR_UNIT rounding rules just in case the size is not a multiple of BYTES_PER_XDR_UNIT. If we run out of preallocated space we should fail (since XDR does not grow buffers). Simplify code to use xdr_inline() to allocate memory rather than using xdr_getpos()/xdr_setpos(). Sanity check return value of xdr_inline() to ensure that it is in sync with the initial value of hg_proc->current_buf->buf_ptr. Includes formatting updates from Jerome.
soumagne
approved these changes
Jan 30, 2025
ok, added HG Proc: |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
hg_proc_hg_bulk_t() uses hg_proc_save_ptr() to allocate buffer space for encoding/decoding bulk handles, but it does not check the return value of hg_proc_save_ptr(). hg_proc_save_ptr() returns NULL on memory allocation failure. update hg_proc_hg_bulk_t() to check the return value of hg_proc_save_ptr() to see if it is NULL.
Update hg_proc_save_ptr():
When hg_proc_save_ptr() is compiled with !HG_HAS_XDR we should check the return value of hg_proc_set_size() for resize errors and fail if hg_proc_set_size() fails.
When hg_proc_save_ptr() is compiled with HG_HAS_XDR, we should follow the XDR BYTES_PER_XDR_UNIT rounding rules just in case the size is not a multiple of BYTES_PER_XDR_UNIT. If we run out of preallocated space we should fail (since XDR does not grow buffers). Simplify code to use xdr_inline() to allocate memory rather than using xdr_getpos()/xdr_setpos(). Sanity check return value of xdr_inline() to ensure that it is in sync with the initial value of hg_proc->current_buf->buf_ptr.