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

* size_t overflow check for cell array

Browse Source 
* use calloc to gain mucho speed for huge dimensions
This commit is contained in:
Nat! 2024-02-29 00:39:20 +01:00 committed by nick black
parent fdd33449f1
commit 2e2cc8121c
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/notcurses.c
View File

@ -532,6 +532,30 @@ make_ncpile(notcurses* nc, ncplane* n){
return ret;
}
static inline size_t ncplane_sizeof_cellarray( unsigned rows, unsigned cols)
{
size_t fbsize;
size_t size;
// (nat) This protects against size_t overflow and also checks
// that dimensions are not zero en-passant. Why ?
// Assume: size_t is 16 bit, unsigned is 8 bit (UINT_MAX: 0xFF)
// nccell is sizeof( *p->fb): 0x10 (128 bit)
//
// 0xFF * 0xFF * 0x10 = 0xFE010, but overflows so: 0xE010
// 0x3F * 0x3F * 0x10 = 0xf810 is the biggest square possible
size = (size_t) cols * (size_t) rows;
if( size < (size_t) cols || size < (size_t) rows)
return 0;
fbsize = sizeof( struct nccell) * size;
if( fbsize <= size)
return 0;
return fbsize;
}
// create a new ncplane at the specified location (relative to the true screen,
// having origin at 0,0), having the specified size, and put it at the top of
// the planestack. its cursor starts at its origin; its style starts as null.
@ -590,14 +614,14 @@ ncplane* ncplane_new_internal(notcurses* nc, ncplane* n,
p->leny = nopts->rows;
p->lenx = nopts->cols;
}
size_t fbsize = sizeof(*p->fb) * (p->leny * p->lenx);
if((p->fb = malloc(fbsize)) == NULL){
size_t fbsize = ncplane_sizeof_cellarray( p->leny, p->lenx);
if( ! fbsize || (p->fb = calloc(1,fbsize)) == NULL){
logerror("error allocating cellmatrix (r=%u, c=%u)",
p->leny, p->lenx);
free(p);
return NULL;
}
memset(p->fb, 0, fbsize);
p->x = p->y = 0;
p->logrow = 0;
p->sprite = NULL;