Skip to content

Fix dangling read buffer in PNG memory decoding #2084

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

Open
Tutez64 wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −15
Open

Fix dangling read buffer in PNG memory decoding #2084

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
23 changes: 8 additions & 15 deletions project/src/graphics/format/PNG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,13 @@ namespace lime {

ReadBuffer (const unsigned char* data, int length) : data (data), length (length), position (0) {}

bool Read (unsigned char* out, int count) {
bool Read (unsigned char* out, png_size_t count) {

if (position >= length) return false;
if (position > length || count > (png_size_t)(length - position)) return false;
if (count == 0) return true;

if (count > length - position) {

memcpy (out, data + position, length - position);
position = length;

} else {

memcpy (out, data + position, count);
position += count;

}
memcpy (out, data + position, count);
position += (int)count;

return true;

Expand Down Expand Up @@ -88,6 +80,7 @@ namespace lime {

FILE_HANDLE* file = NULL;
Bytes* data = NULL;
ReadBuffer buffer (NULL, 0);

if (resource->path) {

Expand Down Expand Up @@ -148,14 +141,14 @@ namespace lime {

data = new Bytes ();
data->ReadFile (resource->path);
ReadBuffer buffer (data->b, data->length);
buffer = ReadBuffer (data->b, data->length);
png_set_read_fn (png_ptr, &buffer, user_read_data_fn);

}

} else {

ReadBuffer buffer (resource->data->b, resource->data->length);
buffer = ReadBuffer (resource->data->b, resource->data->length);
png_set_read_fn (png_ptr, &buffer, user_read_data_fn);

}
Expand Down