Skip to content

Fix two cases of signed integer overflow. #9073

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
merged 1 commit into from
Aug 24, 2017
Merged

Fix two cases of signed integer overflow. #9073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace agg

int not_equal(int ex, int ey, const cell_aa&) const
{
return (ex - x) | (ey - y);
return ex != x || ey != y;
}
};

Expand Down
8 changes: 4 additions & 4 deletions extern/agg24-svn/include/agg_scanline_storage_aa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,10 +720,10 @@ namespace agg
m_ptr = m_data;
if(m_ptr < m_end)
{
m_min_x = read_int32() + m_dx;
m_min_y = read_int32() + m_dy;
m_max_x = read_int32() + m_dx;
m_max_y = read_int32() + m_dy;
m_min_x = read_int32u() + m_dx;
m_min_y = read_int32u() + m_dy;
m_max_x = read_int32u() + m_dx;
m_max_y = read_int32u() + m_dy;
}
return m_ptr < m_end;
}
Expand Down