Skip to content

Fix memory safety and integer overflow bugs in image parsing #21

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

Merged
xiaozhuai merged 6 commits into from
Jan 31, 2026
Merged

Fix memory safety and integer overflow bugs in image parsing #21

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82c1df7
Initial plan
Copilot Jan 31, 2026
9f27a18
Fix 5 critical bugs in imageinfo library
Copilot Jan 31, 2026
53c739f
Improve bounds checking to prevent integer overflow
Copilot Jan 31, 2026
998b898
Task complete: All bugs fixed and verified
Copilot Jan 31, 2026
3a2af57
Clean up build artifacts and update gitignore
Copilot Jan 31, 2026
13c6957
Revert .gitignore changes as requested
Copilot Jan 31, 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
19 changes: 11 additions & 8 deletions include/imageinfo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ class RawDataReader {

inline size_t size() const { return data_.length; }

inline void read(void *buf, off_t offset, size_t size) const { memcpy(buf, ((char *)data_.data) + offset, size); }
inline void read(void *buf, off_t offset, size_t size) const {
assert(offset >= 0 && size <= data_.length && (size_t)offset <= data_.length - size);
memcpy(buf, ((char *)data_.data) + offset, size);
}

private:
RawData data_;
Expand All @@ -241,9 +244,9 @@ class Buffer {

inline size_t size() const { return size_; }

inline uint8_t &operator[](int offset) { return data_.get()[offset]; }
inline uint8_t &operator[](size_t offset) { return data_.get()[offset]; }

inline uint8_t operator[](int offset) const { return data_.get()[offset]; }
inline uint8_t operator[](size_t offset) const { return data_.get()[offset]; }

public:
inline uint8_t read_u8(off_t offset) { return read_int<uint8_t>(offset, false); }
Expand Down Expand Up @@ -549,17 +552,17 @@ inline bool try_avif_heic(ReadInterface &ri, size_t length, ImageInfo &info) {
uint16_t entry_count = buffer.read_u16_be(offset + 14);
off_t t = offset + 16;
for (uint16_t i = 0; i < entry_count; ++i) {
if (box_size < 18) {
if (t + 2 > offset + box_size) {
return false;
}
uint16_t item_id = buffer.read_u16_be(t);
t += 2;
if (box_size < 19) {
if (t + 1 > offset + box_size) {
return false;
}
uint8_t index_count = buffer.read_u8(t);
t += 1;
if (box_size < 19 + index_count) {
if (t + index_count > offset + box_size) {
return false;
}
std::unordered_set<uint8_t> indices;
Expand Down Expand Up @@ -700,7 +703,7 @@ inline bool try_cur_ico(ReadInterface &ri, size_t length, ImageInfo &info) {
int64_t h2 = h1 == 0 ? 256 : h1;
sizes.emplace_back(w2, h2);

uint32_t bytes = buffer.read_s32_le(i * entry_size + 8);
uint32_t bytes = buffer.read_u32_le(i * entry_size + 8);
offset += bytes;
}

Expand Down Expand Up @@ -1057,7 +1060,7 @@ inline bool try_jpg(ReadInterface &ri, size_t length, ImageInfo &info) {
}
auto ifd_main_entries_count = buffer.read_int<uint16_t>(first_ifd_offset + 10, big_endian);
for (uint16_t i = 0; i < ifd_main_entries_count; ++i) {
off_t entry_offset = first_ifd_offset + 12 + i * 12;
off_t entry_offset = first_ifd_offset + 12 + (off_t)i * 12;
if (entry_offset + 12 > section_size + 2) {
return false;
}
Expand Down