Skip to content

Commit

Permalink
CCache: Fix memory/file descriptor leaks
Browse files Browse the repository at this point in the history
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
  • Loading branch information
avalluri committed Jun 17, 2016
1 parent 9b371b4 commit 478d5df
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
13 changes: 12 additions & 1 deletion CCache/ccache.c
Expand Up @@ -130,6 +130,7 @@ static void failed(void)
exit(1);
}
args_add_prefix(orig_args, p);
free(p);
}

if (ccache_verbose) {
Expand Down Expand Up @@ -490,7 +491,9 @@ static void find_hash(ARGS *args)
/* also include the hash of the compiler name - as some compilers
use hard links and behave differently depending on the real name */
if (st.st_nlink > 1) {
hash_string(str_basename(args->argv[0]));
char *path = str_basename(args->argv[0]);
hash_string(path);
free(path);
}

hash_int(st.st_size);
Expand Down Expand Up @@ -523,6 +526,7 @@ static void find_hash(ARGS *args)
input_base, tmp_string(),
i_extension);
x_asprintf(&path_stderr, "%s/tmp.cpp_stderr.%s", temp_dir, tmp_string());
free(input_base);

if (!direct_i_file) {
/* run cpp on the input file to obtain the .i */
Expand Down Expand Up @@ -781,6 +785,7 @@ static void find_compiler(int argc, char **argv)

/* support user override of the compiler */
if ((path=getenv("CCACHE_CC"))) {
free(base);
base = x_strdup(path);
}

Expand All @@ -791,8 +796,10 @@ static void find_compiler(int argc, char **argv)
stats_update(STATS_COMPILER);
cc_log("could not find compiler (%s)\n", base);
perror(base);
free(base);
exit(1);
}
free(base);
}


Expand Down Expand Up @@ -1076,6 +1083,7 @@ static void process_args(int argc, char **argv)
if (strlen(p) < 2) {
cc_log("badly formed dependency file %s\n", output_file);
stats_update(STATS_ARGS);
free(default_depfile_name);
failed();
return;
}
Expand All @@ -1093,6 +1101,7 @@ static void process_args(int argc, char **argv)
strcat(default_depfile_name, ".d");
args_add(stripped_args, "-MF");
args_add(stripped_args, default_depfile_name);
free(default_depfile_name);
}

if (!dependency_target_specified) {
Expand All @@ -1117,6 +1126,7 @@ static void process_args(int argc, char **argv)
exit(1);
}
args_add_prefix(stripped_args, p);
free(p);
}
}

Expand Down Expand Up @@ -1305,6 +1315,7 @@ static void setup_uncached_err(void)

if (putenv(buf) == -1) {
cc_log("putenv failed\n");
close(uncached_fd);
stats_update(STATS_ERROR);
failed();
}
Expand Down
1 change: 1 addition & 0 deletions CCache/execute.c
Expand Up @@ -267,6 +267,7 @@ char *find_executable(const char *name, const char *exclude_name)
}
free(fname);
}
free(path);

return NULL;
#endif
Expand Down
5 changes: 4 additions & 1 deletion CCache/stats.c
Expand Up @@ -138,7 +138,10 @@ static void stats_update_size(enum stats stat, size_t size, size_t numfiles)

memset(counters, 0, sizeof(counters));

if (lock_fd(fd) != 0) return;
if (lock_fd(fd) != 0) {
close(fd);
return;
}

/* read in the old stats */
stats_read_fd(fd, counters);
Expand Down
3 changes: 2 additions & 1 deletion CCache/unify.c
Expand Up @@ -281,6 +281,7 @@ int unify_hash(const char *fname)
fd = open(fname, O_RDONLY|O_BINARY);
if (fd == -1 || fstat(fd, &st) != 0) {
cc_log("Failed to open preprocessor output %s\n", fname);
if (fd != -1) close(fd);
stats_update(STATS_PREPROCESSOR);
return -1;
}
Expand All @@ -289,12 +290,12 @@ int unify_hash(const char *fname)
lines in preprocessor output. I have seen lines of over
100k in length, so this is well worth it */
map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
close(fd);
if (map == (char *)-1) {
cc_log("Failed to mmap %s\n", fname);
stats_update(STATS_PREPROCESSOR);
return -1;
}
close(fd);

/* pass it through the unifier */
unify((unsigned char *)map, st.st_size);
Expand Down
7 changes: 6 additions & 1 deletion CCache/util.c
Expand Up @@ -189,9 +189,11 @@ void copy_fd(int fd_in, int fd_out) {

while ((n = gzread(gz_in, buf, sizeof(buf))) > 0) {
if (write(fd_out, buf, n) != n) {
gzclose(gz_in);
fatal("Failed to copy fd");
}
}
gzclose(gz_in);
}

static int _copy_file(const char *src, const char *dest, int mode) {
Expand Down Expand Up @@ -248,9 +250,11 @@ static int _copy_file(const char *src, const char *dest, int mode) {
}

if (mode == COPY_TO_CACHE) {
gz_out = gzdopen(dup(fd_out), "wb");
int dup_fd_out = dup(fd_out);
gz_out = gzdopen(dup_fd_out, "wb");
if (!gz_out) {
gzclose(gz_in);
close(dup_fd_out);
close(fd_out);
free(tmp_name);
return -1;
Expand Down Expand Up @@ -459,6 +463,7 @@ int create_cachedirtag(const char *dir)
f = fopen(filename, "w");
if (!f) goto error;
if (fwrite(CACHEDIR_TAG, sizeof(CACHEDIR_TAG)-1, 1, f) != 1) {
fclose(f);
goto error;
}
if (fclose(f)) goto error;
Expand Down

0 comments on commit 478d5df

Please sign in to comment.