nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix some memory leaks

Browse Source
This commit is contained in:
nhmall
2024-11-10 22:24:45 -05:00
parent d428beb8dd
commit e83e04dbb3
6 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/windows/Makefile.nmake
View File

@@ -1972,12 +1972,14 @@ $(SRC)\tiles.bmp: $(U)tile2bmp.exe $(TILEFILES)
@echo Creating 16x16 binary tile files (this may take some time)
@$(U)tile2bmp $@
$(U)tile2bmp.exe: $(OUTL)tile2bmp.o $(TEXT_IO)
$(U)tile2bmp.exe: $(OUTL)tile2bmp.o $(TEXT_IO) $(OUTL)alloc.o $(OUTL)panic.o
@echo Linking $(@:\=/)
@$(link) $(LFLAGS) /PDB:"$(OUTL)$(@B).PDB" /MAP:"$(OUTL)$(@B).MAP" $(OUTLHACKLIB) -out:$@ @<<$(@B).lnk
$(OUTL)tile2bmp.o
$(TEXT_IO:^ =^
)
$(OUTL)alloc.o
$(OUTL)panic.o
<<
$(U)til2bm32.exe: $(OUTL)til2bm32.o $(TEXT_IO32)

38
sys/windows/consoletty.c
View File

@@ -145,6 +145,9 @@ extern void (*ibmgraphics_mode_callback)(void); /* symbols.c */
extern void (*utf8graphics_mode_callback)(void); /* symbols.c */
#endif /* VIRTUAL_TERMINAL_SEQUENCES */
static void init_custom_colors(void);
static void free_custom_colors(void);
/* Win32 Screen buffer,coordinate,console I/O information */
COORD ntcoord;
INPUT_RECORD ir;
@@ -317,8 +320,8 @@ WHITE 255,255,255 242,242,242
#ifdef VIRTUAL_TERMINAL_SEQUENCES
long customcolors[CLR_MAX];
const char *esc_seq_colors[CLR_MAX];
const char *esc_seq_bkcolors[CLR_MAX];
const char *esc_seq_colors[CLR_MAX] = { 0 };
const char *esc_seq_bkcolors[CLR_MAX] = { 0 };
struct rgbvalues {
int idx;
@@ -551,6 +554,32 @@ init_custom_colors(void)
esc_seq_bkcolors[CLR_BRIGHT_CYAN] = dupstr(bkcolorbuf);
}
static void
free_custom_colors(void)
{
#define CLR_FREE(c) \
if (esc_seq_bkcolors[(c)] != 0) \
free((genericptr_t) esc_seq_bkcolors[(c)]), esc_seq_bkcolors[(c)] = 0
CLR_FREE(CLR_BLACK);
CLR_FREE(CLR_RED);
CLR_FREE(CLR_GREEN);
CLR_FREE(CLR_YELLOW);
CLR_FREE(CLR_BLUE);
CLR_FREE(CLR_MAGENTA);
CLR_FREE(CLR_CYAN);
CLR_FREE(CLR_WHITE);
CLR_FREE(CLR_BROWN);
CLR_FREE(CLR_GRAY);
CLR_FREE(NO_COLOR);
CLR_FREE(CLR_ORANGE);
CLR_FREE(CLR_BRIGHT_GREEN);
CLR_FREE(CLR_BRIGHT_BLUE);
CLR_FREE(CLR_BRIGHT_MAGENTA);
CLR_FREE(CLR_BRIGHT_CYAN);
#undef CLR_FREE
}
void emit_start_bold(void);
void emit_stop_bold(void);
void emit_start_dim(void);
@@ -1099,8 +1128,13 @@ consoletty_open(int mode)
void
consoletty_exit(void)
{
/* frees some status tracking data */
genl_status_finish();
/* go back to using the safe routines */
safe_routines();
free_custom_colors();
free((genericptr_t) console.localestr);
free((genericptr_t) console.orig_localestr);
}
int