Sanitize existing names/descriptions and prevent new issues #160
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
Since this is a diff against the old (pre-unit test) code, I cannot prove that this works, but I will be applying an analogous patch + unit tests against main here shortly. This feels correct in that it will a) strip out the 'real' unit/faction/object number from the name. b) rebuild the name with the new set of legal characters (and reattach the unit/faction/object number) c) sanitize the descriptions to only the new set of legal characters on readin. d) prevent (via the change to islegal()) any new names or descriptions from containing the bogus characters. The non-allowed characters are now the set ()[]; instead of just () as before.
valdisz
approved these changes
Nov 30, 2023
| @@ -289,10 +289,10 @@ int AString::getat() | |||
| char islegal(char c) | |||
| { | |||
| if ((c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9') || | |||
| c=='!' || c=='[' || c==']' || c==',' || c=='.' || c==' ' || | |||
There was a problem hiding this comment.
it will not allow [ and ] in the unit names
There was a problem hiding this comment.
Nor in object or faction names.
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.
Since this is a diff against the old (pre-unit test) code, I cannot prove that this works, but I will be applying an analogous patch +
unit tests against main here shortly. This feels correct in that
it will
a) strip out the 'real' unit/faction/object number from the name. b) rebuild the name with the new set of legal characters (and reattach the unit/faction/object number)
c) sanitize the descriptions to only the new set of legal characters on readin.
d) prevent (via the change to islegal()) any new names or descriptions from containing the bogus characters.
The non-allowed characters are now the set ()[]; instead of just () as before.