Fix multiple file match bugs #724
Merged
Conversation
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
This commit fixes a number of file match bugs: * __filter_file_buf() was passing a length value of one less than the string length to cmpbytes() and as a result Equals and Prefix matches were testing one fewer bytes than required. * ASM_RCMP (used in rcmpbytes()) was decrementing the string indices before testing if they were <1. This resulted in one fewer bytes being tested than required. * ASM_RCMP50 comprisd of 2x ASM_RCMP20 and 1x ASM_RCMP5, totalling 45 iterations of ASM_RCMP, instead of 50. * __filter_file_buf() tested failed postfix matches with a forward string match. This resulted in files that started with the postfix, but didn't end with it, matching when they shouldn't. * cmpbytes() continued to loop to full number of iterations, even when the string length had been exhausted (inefficient). * Added descriptions to cmpbytes() and rcmpbytes() to aid in providing the correct parameters. Signed-off-by: Kevin Sheldrake <[email protected]>
|
I vaguely remember these things being off by one the other way and something about the \n\r chars but don't recall the details. Anyways tests should be able to verify this is all correct. (Note I only read the pr msg so far)./ |
kkourt
approved these changes
Feb 23, 2023
Rudimentary tests (i.e. manipulating CRD and testing) seems to confirm the fixes work as expected. |
Closed
|
added an issue for adding tests to catch the issues here: #728. (My assumption is that we do not need to wait for the tests, before we merge this. Happy to wait though :) ) |
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.
This commit fixes a number of file match bugs:
__filter_file_buf() was passing a length value of one less than the string length to cmpbytes() and as a result Equals and Prefix matches were testing one fewer bytes than required.
ASM_RCMP (used in rcmpbytes()) was decrementing the string indices before testing if they were <1. This resulted in one fewer bytes being tested than required.
ASM_RCMP50 comprisd of 2x ASM_RCMP20 and 1x ASM_RCMP5, totalling 45 iterations of ASM_RCMP, instead of 50.
__filter_file_buf() tested failed postfix matches with a forward string match. This resulted in files that started with the postfix, but didn't end with it, matching when they shouldn't.
cmpbytes() continued to loop to full number of iterations, even when the string length had been exhausted (inefficient).
Added descriptions to cmpbytes() and rcmpbytes() to aid in providing the correct parameters.