mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-03-14 01:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assert that sf::Image::{set|get}Pixel coordinates are within bounds

Browse Source 
Yay catching more UB :)
This commit is contained in:
Chris Thrasher 2023-10-20 18:41:47 -05:00
parent fb873548b6
commit 9b92e2e68e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SFML/Graphics/Image.cpp
View File

@ -35,6 +35,7 @@
#include <algorithm> #include <algorithm>
#include <ostream> #include <ostream>
#include <cassert>
#include <cstring> #include <cstring>
@ -263,7 +264,9 @@ void Image::createMaskFromColor(const Color& color, std::uint8_t alpha)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Image::setPixel(const Vector2u& coords, const Color& color) void Image::setPixel(const Vector2u& coords, const Color& color)
{ {
std::uint8_t* pixel = &m_pixels[(coords.x + coords.y * m_size.x) * 4]; const auto index = (coords.x + coords.y * m_size.x) * 4;
assert(index < m_pixels.size() && "Image::setPixel() cannot access out of bounds pixel");
std::uint8_t* pixel = &m_pixels[index];
*pixel++ = color.r; *pixel++ = color.r;
*pixel++ = color.g; *pixel++ = color.g;
*pixel++ = color.b; *pixel++ = color.b;
@ -274,7 +277,9 @@ void Image::setPixel(const Vector2u& coords, const Color& color)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Color Image::getPixel(const Vector2u& coords) const Color Image::getPixel(const Vector2u& coords) const
{ {
const std::uint8_t* pixel = &m_pixels[(coords.x + coords.y * m_size.x) * 4]; const auto index = (coords.x + coords.y * m_size.x) * 4;
assert(index < m_pixels.size() && "Image::getPixel() cannot access out of bounds pixel");
const std::uint8_t* pixel = &m_pixels[index];
return {pixel[0], pixel[1], pixel[2], pixel[3]}; return {pixel[0], pixel[1], pixel[2], pixel[3]};
} }