blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 09:09:03 -04:00
Code Issues Projects Releases Wiki Activity

ncvisual_from_*(): check geometries for validity

Browse Source
This commit is contained in:
nick black 2024-06-11 09:01:51 -04:00
parent 21429dacc2
commit 87ff6fb048
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/visual.c
View File

@ -778,6 +778,10 @@ ncvisual* ncvisual_from_rgba(const void* rgba, int rows, int rowstride, int cols
logerror("rowstride %d not a multiple of 4", rowstride);
return NULL;
}
if(rowstride * 4 < cols || cols <= 0 || rows <= 0){
logerror("invalid rowstride or geometry");
return NULL;
}
ncvisual* ncv = ncvisual_create();
if(ncv){
// ffmpeg needs inputs with rows aligned on 192-byte boundaries
@ -812,6 +816,14 @@ ncvisual* ncvisual_from_sixel(const char* s, unsigned leny, unsigned lenx){
ncvisual* ncvisual_from_rgb_packed(const void* rgba, int rows, int rowstride,
int cols, int alpha){
if(rowstride % 3){
logerror("rowstride %d not a multiple of 3", rowstride);
return NULL;
}
if(rows <= 0 || cols <= 0 || rowstride < cols * 3){
logerror("illegal packed rgb geometry");
return NULL;
}
ncvisual* ncv = ncvisual_create();
if(ncv){
ncv->rowstride = pad_for_image(cols * 4, cols);
@ -849,6 +861,10 @@ ncvisual* ncvisual_from_rgb_loose(const void* rgba, int rows, int rowstride,
logerror("rowstride %d not a multiple of 4", rowstride);
return NULL;
}
if(rows <= 0 || cols <= 0 || rowstride < cols * 4){
logerror("illegal packed rgb geometry");
return NULL;
}
ncvisual* ncv = ncvisual_create();
if(ncv){
ncv->rowstride = pad_for_image(cols * 4, cols);
@ -874,6 +890,11 @@ ncvisual* ncvisual_from_rgb_loose(const void* rgba, int rows, int rowstride,
ncvisual* ncvisual_from_bgra(const void* bgra, int rows, int rowstride, int cols){
if(rowstride % 4){
logerror("rowstride %d not a multiple of 4", rowstride);
return NULL;
}
if(rows <= 0 || cols <= 0 || rowstride < cols * 4){
logerror("illegal bgra geometry");
return NULL;
}
ncvisual* ncv = ncvisual_create();
@ -907,10 +928,14 @@ ncvisual* ncvisual_from_bgra(const void* bgra, int rows, int rowstride, int cols
ncvisual* ncvisual_from_palidx(const void* pdata, int rows, int rowstride,
int cols, int palsize, int pstride,
const uint32_t* palette){
if(rowstride % pstride){
if(pstride <= 0 || rowstride % pstride){
logerror("bad pstride (%d) for rowstride (%d)", pstride, rowstride);
return NULL;
}
if(rows <= 0 || cols <= 0 || rowstride < cols * pstride){
logerror("illegal palimg geometry");
return NULL;
}
if(palsize > 256 || palsize <= 0){
logerror("palettes size (%d) is unsupported", palsize);
return NULL;