CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(3DS) video driver: add some checks for the validty of incoming data.

Browse Source
This commit is contained in:
aliaspider 2016-10-04 15:49:55 +01:00
parent e5970e8095
commit c4daa087d4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/drivers/ctr_gfx.c
View File

@ -200,6 +200,7 @@ static void ctr_update_viewport(ctr_video_t* ctr)
static void ctr_lcd_aptHook(APT_HookType hook, void* param) static void ctr_lcd_aptHook(APT_HookType hook, void* param)
{ {
ctr_video_t *ctr = (ctr_video_t*)param; ctr_video_t *ctr = (ctr_video_t*)param;
if(!ctr) if(!ctr)
return; return;
@ -854,19 +855,21 @@ static void ctr_set_texture_frame(void* data, const void* frame, bool rgb32,
{ {
int i; int i;
ctr_video_t* ctr = (ctr_video_t*)data; ctr_video_t* ctr = (ctr_video_t*)data;
uint16_t* dst = (uint16_t*)ctr->menu.texture_linear;
const uint16_t* src = frame;
int line_width = width; int line_width = width;
(void)rgb32; (void)rgb32;
(void)alpha; (void)alpha;
if(!ctr || !frame)
return;
if (line_width > ctr->menu.texture_width) if (line_width > ctr->menu.texture_width)
line_width = ctr->menu.texture_width; line_width = ctr->menu.texture_width;
if (height > (unsigned)ctr->menu.texture_height) if (height > (unsigned)ctr->menu.texture_height)
height = (unsigned)ctr->menu.texture_height; height = (unsigned)ctr->menu.texture_height;
const uint16_t* src = frame;
uint16_t* dst = (uint16_t*)ctr->menu.texture_linear;
for (i = 0; i < height; i++) for (i = 0; i < height; i++)
{ {
memcpy(dst, src, line_width * sizeof(uint16_t)); memcpy(dst, src, line_width * sizeof(uint16_t));
@ -918,6 +921,9 @@ static void ctr_set_aspect_ratio(void* data, unsigned aspect_ratio_idx)
{ {
ctr_video_t *ctr = (ctr_video_t*)data; ctr_video_t *ctr = (ctr_video_t*)data;
if(!ctr)
return;
switch (aspect_ratio_idx) switch (aspect_ratio_idx)
{ {
case ASPECT_RATIO_SQUARE: case ASPECT_RATIO_SQUARE:
@ -965,6 +971,9 @@ static uintptr_t ctr_load_texture(void *video_data, void *data,
ctr_video_t* ctr = (ctr_video_t*)video_data; ctr_video_t* ctr = (ctr_video_t*)video_data;
struct texture_image *image = (struct texture_image*)data; struct texture_image *image = (struct texture_image*)data;
if(!ctr || !image)
return;
ctr_texture_t* texture = calloc(1, sizeof(ctr_texture_t)); ctr_texture_t* texture = calloc(1, sizeof(ctr_texture_t));
uint32_t texsize = image->width * image->height * sizeof(uint32_t); uint32_t texsize = image->width * image->height * sizeof(uint32_t);
void* tmpdata; void* tmpdata;
@ -976,7 +985,7 @@ static uintptr_t ctr_load_texture(void *video_data, void *data,
texture->height = image->height; texture->height = image->height;
if ((!texture->data)) if (!texture->data)
{ {
free(texture); free(texture);
return 0; return 0;
@ -1019,6 +1028,7 @@ static uintptr_t ctr_load_texture(void *video_data, void *data,
static void ctr_unload_texture(void *data, uintptr_t handle) static void ctr_unload_texture(void *data, uintptr_t handle)
{ {
struct ctr_texture *texture = (struct ctr_texture*)handle; struct ctr_texture *texture = (struct ctr_texture*)handle;
if (!texture) if (!texture)
return; return;
@ -1037,7 +1047,7 @@ static void ctr_set_osd_msg(void *data, const char *msg,
{ {
ctr_video_t* ctr = (ctr_video_t*)data; ctr_video_t* ctr = (ctr_video_t*)data;
if (ctr->msg_rendering_enabled) if (ctr && ctr->msg_rendering_enabled)
font_driver_render_msg(font, msg, params); font_driver_render_msg(font, msg, params);
} }