Skip to content

catch stoul exceptions in CanonMakerNote print0x000a/print0x000c (backport #9320) #9373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
+12 −4
Closed

catch stoul exceptions in CanonMakerNote print0x000a/print0x000c (backport #9320) #9373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03c74d
catch stoul exceptions in CanonMakerNote print0x000a/print0x000c
netliomax25-code Jun 1, 2026
00a13a5
catch std::logic_error to cover both stoul failure modes
netliomax25-code Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2714,8 +2714,12 @@ std::ostream& CanonMakerNote::print0x0008(std::ostream& os, const Value& value,
}

std::ostream& CanonMakerNote::print0x000a(std::ostream& os, const Value& value, const ExifData*) {
uint32_t l = std::stoul(value.toString());
return os << stringFormat("{:04x}{:05}", (l >> 16) & 0xFFFF, l & 0xFFFF);
try {
uint32_t l = std::stoul(value.toString());
return os << stringFormat("{:04x}{:05}", (l >> 16) & 0xFFFF, l & 0xFFFF);
} catch (const std::logic_error&) {
return os << value;
}
}

std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData* exifData) {
Expand All @@ -2727,8 +2731,12 @@ std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value,
auto pos = exifData->findKey(key);
// if model is EOS D30
if (pos != exifData->end() && pos->value().count() == 1 && pos->value().toInt64() == 0x01140000) {
uint32_t l = std::stoul(value.toString());
return os << stringFormat("{:04x}{:05}", (l >> 16) & 0xFFFF, l & 0xFFFF);
try {
uint32_t l = std::stoul(value.toString());
return os << stringFormat("{:04x}{:05}", (l >> 16) & 0xFFFF, l & 0xFFFF);
} catch (const std::logic_error&) {
return os << value;
}
}
return os << value;
}
Expand Down
Loading