Skip to content

Commit

Permalink
fakenect: Fix memory leaks - fixes #205
Browse files Browse the repository at this point in the history
Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
  • Loading branch information
piedar committed Nov 16, 2013
1 parent 90eea5a commit 0d75750
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
5 changes: 3 additions & 2 deletions fakenect/fakenect.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,18 @@ static int parse_line(char *type, double *cur_time, unsigned int *timestamp, uns
exit(1);
}
// Parse data from file name
int ret = 0;
*data_size = get_data_size(cur_fp);
sscanf(line, "%c-%lf-%u-%*s", type, cur_time, timestamp);
*data = malloc(*data_size);
if (fread(*data, *data_size, 1, cur_fp) != 1) {
printf("Error: Couldn't read entire file.\n");
return -1;
ret = -1;
}
fclose(cur_fp);
free(line);
free(file_path);
return 0;
return ret;
}

static void open_index()
Expand Down
13 changes: 9 additions & 4 deletions fakenect/record.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,10 @@ int main(int argc, char **argv)

char *index_fn = malloc(strlen(out_dir) + 50);
sprintf(index_fn, "%s-index.txt", out_dir);
index_fp = open_index(index_fn);
if (!index_fp) return 1;
index_fp = open_index(index_fn);
free(index_fn);
if (!index_fp)
return 1;

depth_name = malloc(strlen(out_dir) + 50);
rgb_name = malloc(strlen(out_dir) + 50);
Expand Down Expand Up @@ -340,9 +341,13 @@ int main(int argc, char **argv)
#endif
char *fn = malloc(strlen(out_dir) + 50);
sprintf(fn, "%s/INDEX.txt", out_dir);
index_fp = open_index(fn);
if (!index_fp) return 1;
index_fp = open_index(fn);
free(fn);
if (!index_fp) {
fclose(index_fp)
return 1;
}

init();
fclose(index_fp);
}
Expand Down

0 comments on commit 0d75750

Please sign in to comment.