[MRG] Prevent crash due to invalid private creator #1639
Merged
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
- issue a warning but don't change the private creator logic - fixes pydicom#1638
Codecov Report
@@ Coverage Diff @@
## master #1639 +/- ##
==========================================
+ Coverage 97.57% 97.67% +0.10%
==========================================
Files 66 66
Lines 10666 10674 +8
==========================================
+ Hits 10407 10426 +19
+ Misses 259 248 -11
📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more |
mrbean-bremen
changed the title
scaramallion
approved these changes
Apr 23, 2022
darcymason
approved these changes
Apr 23, 2022
| @@ -553,6 +553,10 @@ def get_private_entry( | |||
| f"Private creator '{private_creator}' not in the private " | |||
| "dictionary" | |||
| ) from exc | |||
| except TypeError as exc: | |||
| msg = f"'{private_creator}' is not a valid private creator" | |||
| warnings.warn(msg) | |||
There was a problem hiding this comment.
I think it would be helpful to have the tag number here as well as its value.
There was a problem hiding this comment.
Sorry, for some reason I missed that comment - adapted now.
darcymason
approved these changes
Apr 27, 2022
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.
Describe the changes
I decided to make a minimum impact change that only prevents the crash. Any invalid private creator will still be handled as a private creator with respect to the private tags.
The crash itself only happens due to the lookup of the key in the private dictionary, which now behaves the same as a valid private creator not present in the dictionary.
Tasks