-
Notifications
You must be signed in to change notification settings - Fork 156
range-diff: fix integer overflow in get_correspondences() #1957
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
range-diff: fix integer overflow in get_correspondences() #1957
Conversation
The get_correspondences() function uses 'int' to store the sum of two 'size_t' values from string_list structures. When processing large patch sets where a->nr + b->nr exceeds INT_MAX, the value wraps to negative, causing invalid array indexing and a segmentation fault. This manifests as a crash at line 356 in range-diff.c when accessing cost[i + n * j] with a negative or incorrectly calculated index. Fix this by using 'size_t' throughout for array sizes and indices. The compute_assignment() function signature is updated to accept size_t parameters, maintaining int only for sentinel values (-1). Note that while this fix prevents the integer overflow and segmentation fault, attempting to process extremely large patch sets will still hit memory limitations. In practice, the process will consume excessive memory and likely be terminated by the system (SIGKILL) before completing. However, fixing the integer overflow is still correct and allows range-diff to fail gracefully due to resource constraints rather than undefined behavior. Signed-off-by: Paulo Casaretto <[email protected]>
Welcome to GitGitGadgetHi @pcasaretto, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that either:
You can CC potential reviewers by adding a footer to the PR description with the following syntax:
NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description, Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel
Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):
To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join [email protected], where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
/allow |
User pcasaretto is now allowed to use GitGitGadget. WARNING: pcasaretto has no public email address set on GitHub; GitGitGadget needs an email address to Cc: you on your contribution, so that you receive any feedback on the Git mailing list. Go to https://github.com/settings/profile to make your preferred email public to let GitGitGadget know which email address to use. |
User pcasaretto already allowed to use GitGitGadget. |
Reworking this. |
Summary
This PR fixes a segmentation fault in
git range-diff
caused by integer overflow when processing large patch sets.Problem
The
get_correspondences()
function usesint
to store the sum of twosize_t
values fromstring_list
structures. When processing large patch sets wherea->nr + b->nr
exceedsINT_MAX
(2,147,483,647), the value wraps to negative, causing invalid array indexing and a segmentation fault.The crash manifests at line 356 in range-diff.c when accessing
cost[i + n * j]
with a negative or incorrectly calculated index.Solution
This patch fixes the issue by:
size_t
throughout for array sizes and indices inget_correspondences()
compute_assignment()
function signature to acceptsize_t
parametersint
only for sentinel values (-1) where necessaryKnown Limitations
While this fix prevents the integer overflow and segmentation fault, attempting to process extremely large patch sets will still hit memory limitations. The process will consume excessive memory and likely be terminated by the system (SIGKILL) before completing. However, this fix is still valuable as it allows range-diff to fail gracefully due to resource constraints rather than undefined behavior.
Testing
The fix has been:
git diff --check
(no whitespace errors)Files Changed
range-diff.c
: Changed variable types fromint
tosize_t
forn
,i
, andj
linear-assignment.h
: Updated function signature to usesize_t
parameterslinear-assignment.c
: Updated implementation to usesize_t
for loop indices, adjusted countdown loop patterncc @gitgitgadget