catch stoul exceptions in CanonMakerNote print0x000a/print0x000c#9320
Open
netliomax25-code wants to merge 3 commits into
Open
catch stoul exceptions in CanonMakerNote print0x000a/print0x000c#9320netliomax25-code wants to merge 3 commits into
netliomax25-code wants to merge 3 commits into
Conversation
Collaborator
|
@mergify backport 0.28.x 0.29.x |
Contributor
🟠 Waiting for conditions to matchDetails
|
Comment on lines
+2720
to
+2723
| } catch (const std::invalid_argument&) { | ||
| return os << value; | ||
| } catch (const std::out_of_range&) { | ||
| return os << value; |
Collaborator
There was a problem hiding this comment.
Suggested change
| } catch (const std::invalid_argument&) { | |
| return os << value; | |
| } catch (const std::out_of_range&) { | |
| return os << value; | |
| } catch (const std::logic_error&) { | |
| return os << value; |
Contributor
Author
There was a problem hiding this comment.
Good catch, both derive from std::logic_error so one catch covers them. Switched both functions over and pushed.
Collaborator
There was a problem hiding this comment.
You used std::logic_error in #9321, so why not here? It makes me think that this is AI-generated code.
Comment on lines
+2739
to
+2742
| } catch (const std::invalid_argument&) { | ||
| return os << value; | ||
| } catch (const std::out_of_range&) { | ||
| return os << value; |
Collaborator
There was a problem hiding this comment.
Suggested change
| } catch (const std::invalid_argument&) { | |
| return os << value; | |
| } catch (const std::out_of_range&) { | |
| return os << value; | |
| } catch (const std::logic_error&) { | |
| return os << value; |
Contributor
Author
There was a problem hiding this comment.
Same here, collapsed to std::logic_error in print0x000c too.
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
2 participants
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.
print0x000a and print0x000c call std::stoul(value.toString()), but the stored type of Canon tags 0x000a and 0x000c is not enforced during parsing, so a crafted makernote can hand them a non-numeric ASCII value. stoul then throws std::invalid_argument, which Exifdatum::write does not catch (it only guards std::out_of_range), so it escapes during -pa printing. Catch both and fall back to the raw value, like the existing path in print0x000c.