geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add null termination to Wayland_data_source_get_data() if requested 

Fixes https://github.com/libsdl-org/SDL/issues/6083
main
Sam Lantinga 2022-08-18 19:05:55 -07:00
parent 948dbe7d3f
commit 6e007c36e7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/wayland/SDL_waylanddatamanager.c
View File

@ -305,14 +305,22 @@ Wayland_data_source_get_data(SDL_WaylandDataSource *source,
} else { } else {
mime_data = mime_data_list_find(&source->mimes, mime_type); mime_data = mime_data_list_find(&source->mimes, mime_type);
if (mime_data != NULL && mime_data->length > 0) { if (mime_data != NULL && mime_data->length > 0) {
buffer = SDL_malloc(mime_data->length); size_t buffer_length = mime_data->length;
if (null_terminate == SDL_TRUE) {
++buffer_length;
}
buffer = SDL_malloc(buffer_length);
if (buffer == NULL) { if (buffer == NULL) {
*length = SDL_OutOfMemory(); *length = SDL_OutOfMemory();
} else { } else {
*length = mime_data->length; *length = mime_data->length;
SDL_memcpy(buffer, mime_data->data, mime_data->length); SDL_memcpy(buffer, mime_data->data, mime_data->length);
if (null_terminate) {
*((Uint8 *)buffer + mime_data->length) = 0;
}
} }
} }
} }
return buffer; return buffer;