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

notcurses_init: free memstream on error paths

Browse Source
This commit is contained in:
nick black 2021-04-12 03:23:55 -04:00
parent 013ac94cd5
commit 084d5d6673
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/notcurses.c
View File

@ -932,6 +932,8 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
if(ret == NULL){
return ret;
}
ret->rstate.mstream = NULL;
ret->rstate.mstreamfp = NULL;
ret->loglevel = opts->loglevel;
if(!(opts->flags & NCOPTION_INHIBIT_SETLOCALE)){
init_lang(ret);
@ -945,7 +947,6 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
}else{
fprintf(stderr, "Encoding (\"%s\") was neither ANSI_X3.4-1968 nor UTF-8, refusing to start\n Did you call setlocale()?\n",
encoding ? encoding : "none found");
free(ret);
return NULL;
}
if(outfp == NULL){
@ -1041,6 +1042,7 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
goto err;
}
if(ret->ttyfd >= 0){
reset_term_attributes(ret);
if(!(opts->flags & NCOPTION_NO_CLEAR_BITMAPS)){
if(sprite_init(ret)){
free_plane(ret->stdplane);
@ -1055,7 +1057,6 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
free_plane(ret->stdplane);
goto err;
}
reset_term_attributes(ret);
}
if((ret->rstate.mstreamfp = open_memstream(&ret->rstate.mstream, &ret->rstate.mstrsize)) == NULL){
free_plane(ret->stdplane);
@ -1088,6 +1089,10 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
err:
fprintf(stderr, "Alas, you will not be going to space today.\n");
// FIXME looks like we have some memory leaks on this error path?
if(ret->rstate.mstreamfp){
fclose(ret->rstate.mstreamfp);
}
free(ret->rstate.mstream);
tcsetattr(ret->ttyfd, TCSANOW, &ret->tpreserved);
drop_signals(ret);
pthread_mutex_destroy(&ret->statlock);