oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

plug memory leak

Browse Source
This commit is contained in:
Love Hornquist Astrand
2013-04-24 20:17:01 -07:00
parent 81263bc94c
commit 124ab6957c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/log.c
View File

@@ -202,6 +202,7 @@ struct file_data{
const char *mode; const char *mode;
FILE *fd; FILE *fd;
int keep_open; int keep_open;
int freefilename;
}; };
static void KRB5_CALLCONV static void KRB5_CALLCONV
@@ -236,20 +237,27 @@ close_file(void *data)
struct file_data *f = data; struct file_data *f = data;
if(f->keep_open && f->filename) if(f->keep_open && f->filename)
fclose(f->fd); fclose(f->fd);
if (f->filename && f->freefilename)
free((char *)f->filename);
free(data); free(data);
} }
static krb5_error_code static krb5_error_code
open_file(krb5_context context, krb5_log_facility *fac, int min, int max, open_file(krb5_context context, krb5_log_facility *fac, int min, int max,
const char *filename, const char *mode, FILE *f, int keep_open) const char *filename, const char *mode, FILE *f, int keep_open,
int freefilename)
{ {
struct file_data *fd = malloc(sizeof(*fd)); struct file_data *fd = malloc(sizeof(*fd));
if (fd == NULL) if (fd == NULL) {
if (freefilename && filename)
free((char *)filename);
return krb5_enomem(context); return krb5_enomem(context);
}
fd->filename = filename; fd->filename = filename;
fd->mode = mode; fd->mode = mode;
fd->fd = f; fd->fd = f;
fd->keep_open = keep_open; fd->keep_open = keep_open;
fd->freefilename = freefilename;
return krb5_addlog_func(context, fac, min, max, log_file, close_file, fd); return krb5_addlog_func(context, fac, min, max, log_file, close_file, fd);
} }
@@ -285,9 +293,9 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
p++; p++;
} }
if(strcmp(p, "STDERR") == 0){ if(strcmp(p, "STDERR") == 0){
ret = open_file(context, f, min, max, NULL, NULL, stderr, 1); ret = open_file(context, f, min, max, NULL, NULL, stderr, 1, 0);
}else if(strcmp(p, "CONSOLE") == 0){ }else if(strcmp(p, "CONSOLE") == 0){
ret = open_file(context, f, min, max, "/dev/console", "w", NULL, 0); ret = open_file(context, f, min, max, "/dev/console", "w", NULL, 0, 0);
}else if(strncmp(p, "FILE", 4) == 0 && (p[4] == ':' || p[4] == '=')){ }else if(strncmp(p, "FILE", 4) == 0 && (p[4] == ':' || p[4] == '=')){
char *fn; char *fn;
FILE *file = NULL; FILE *file = NULL;
@@ -319,9 +327,9 @@ krb5_addlog_dest(krb5_context context, krb5_log_facility *f, const char *orig)
} }
keep_open = 1; keep_open = 1;
} }
ret = open_file(context, f, min, max, fn, "a", file, keep_open); ret = open_file(context, f, min, max, fn, "a", file, keep_open, 1);
}else if(strncmp(p, "DEVICE", 6) == 0 && (p[6] == ':' || p[6] == '=')){ }else if(strncmp(p, "DEVICE", 6) == 0 && (p[6] == ':' || p[6] == '=')){
ret = open_file(context, f, min, max, strdup(p + 7), "w", NULL, 0); ret = open_file(context, f, min, max, strdup(p + 7), "w", NULL, 0, 1);
}else if(strncmp(p, "SYSLOG", 6) == 0 && (p[6] == '\0' || p[6] == ':')){ }else if(strncmp(p, "SYSLOG", 6) == 0 && (p[6] == '\0' || p[6] == ':')){
char severity[128] = ""; char severity[128] = "";
char facility[128] = ""; char facility[128] = "";