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

cell_load: check for negative cols result, propagate #761

Browse Source
This commit is contained in:
Nick Black 2020-07-04 00:45:41 -04:00
parent ecc7bb25cc
commit c88c51c4d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/notcurses.c
View File

@ -1217,8 +1217,6 @@ int ncplane_putc_yx(ncplane* n, int y, int x, const cell* c){
} }
scroll_down(n); scroll_down(n);
} }
if(c->gcluster == '\n'){ fprintf(stderr, "YARP YARP\n"); }
if(ncplane_cursor_move_yx(n, y, x)){ if(ncplane_cursor_move_yx(n, y, x)){
return -1; return -1;
} }
@ -1333,7 +1331,7 @@ int ncplane_cursor_at(const ncplane* n, cell* c, char** gclust){
int cell_load(ncplane* n, cell* c, const char* gcluster){ int cell_load(ncplane* n, cell* c, const char* gcluster){
int bytes; int bytes;
int cols; int cols;
if((bytes = utf8_egc_len(gcluster, &cols)) >= 0 && bytes <= 1){ if((bytes = utf8_egc_len(gcluster, &cols)) >= 0 && cols >= 0 && bytes <= 1){
cell_release(n, c); cell_release(n, c);
c->channels &= ~CELL_WIDEASIAN_MASK; c->channels &= ~CELL_WIDEASIAN_MASK;
c->gcluster = *gcluster; c->gcluster = *gcluster;
@ -1341,8 +1339,10 @@ int cell_load(ncplane* n, cell* c, const char* gcluster){
} }
if(cols > 1){ if(cols > 1){
c->channels |= CELL_WIDEASIAN_MASK; c->channels |= CELL_WIDEASIAN_MASK;
}else{ }else if(cols >= 0){
c->channels &= ~CELL_WIDEASIAN_MASK; c->channels &= ~CELL_WIDEASIAN_MASK;
}else{
return -1;
} }
if(!cell_simple_p(c)){ if(!cell_simple_p(c)){
if(strcmp(gcluster, cell_extended_gcluster(n, c)) == 0){ if(strcmp(gcluster, cell_extended_gcluster(n, c)) == 0){