From 9daef33e32ba36c1f872691daeebbf98a73b4b25 Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Fri, 20 Apr 2012 14:16:07 -0700 Subject: Free XauFileName() static buffer at exit XauFileName() may allocate and return a static buffer. The only way to ensure it is freed is to deallocate it when the program exits. Signed-off-by: Chase Douglas Reviewed-by: Alan Coopersmith --- AuFileName.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/AuFileName.c b/AuFileName.c index f384f75..bc7b177 100644 --- a/AuFileName.c +++ b/AuFileName.c @@ -31,13 +31,22 @@ in this Software without prior written authorization from The Open Group. #include #include +static char *buf = NULL; + +static void +free_filename_buffer(void) +{ + free(buf); + buf = NULL; +} + char * XauFileName (void) { const char *slashDotXauthority = "/.Xauthority"; char *name; - static char *buf; static int bsize; + static int atexit_registered = 0; #ifdef WIN32 char dir[128]; #endif @@ -64,6 +73,12 @@ XauFileName (void) buf = malloc ((unsigned) size); if (!buf) return NULL; + + if (!atexit_registered) { + atexit(free_filename_buffer); + atexit_registered = 1; + } + bsize = size; } strcpy (buf, name); -- cgit v1.2.3