cmp: use checked subtraction for the verbose offset padding - #275
Merged
Conversation
The --verbose branch of format_verbose_difference padded the byte-offset column with a plain subtraction while the --print-bytes branch above it already used saturating_sub. offset_width is derived from the smaller file's metadata length, so a file reporting length 0 that still yields bytes (/dev/zero) collapses it to 2 and the subtraction underflows once the offset reaches three digits. Fixes uutils#265
|
GNU diffutils testsuite comparison: |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #265.
The
--print-bytesbranch offormat_verbose_differencealready pads withsaturating_sub; the--verbosebranch a few lines down uses a plain-. Sinceoffset_widthcomes from the smaller file's metadata length, a file that reports length 0 but still yields bytes collapses it to 2, and the subtraction underflows as soon as the running offset reaches three digits.Before, that stops after byte 99 (abort under overflow-checks, a huge padding loop otherwise). After, all 150 lines print and it exits 1.
Made the two branches match rather than adding a separate guard.
Worth flagging since the issue shows GNU's output: the column is still narrower than GNU's here, because
offset_widthis derived from a metadata length that is 0 for this kind of file. That is the same root input, but it is a formatting difference rather than a crash, so I have left it out of this change.Tests: an integration test covering the case, gated to unix for
/dev/zero.