Prevent recursive includes of keymap components #389
Closed
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
|
There seems to be memory leaks in key types code that make the test suite failed when runing with valgrind. |
When there is no error the types are “stolen” and copied to the keymap. But when there is an error, `MergeIncludedKeyTypes` just return without “stealing” nor freeing the types. Fixed by explicitly freeing the key types.
Merged
wismill
force-pushed
the
include/check-recursive
branch
from
b69a538 to
9abe663
Compare
- Add file name property to `XkbFile`. This allow better identification of the file being processed. - Add check for recursive includes of keycodes, key types, compat and symbols keymap components. - Add tests for recursive includes.
wismill
force-pushed
the
include/check-recursive
branch
from
9abe663 to
50e2939
Compare
|
A simpler and arguably more robust method for detecting include loops is to have an include depth limit. Have you considered it? |
|
@bluetech I did, but then I thought it would be cleaner to do an exact check that:
I guess this issue is unlikely enough that we could just do as you propose. I have no idea what is the depth threshold in |
|
Created an alternative design in #392. |
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.
Prevent recursive includes of keymap components:
XkbFile. This allow better identification of the file being processed.I would like to get the design right wrt further work on #390.