diff options
author | Thomas White <taw@physics.org> | 2014-08-12 13:42:36 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2014-08-12 13:42:46 +0200 |
commit | 5b6749b20e1fe14f994df0eb3a8096d69a72326a (patch) | |
tree | d4fac0251f595a1c9e3c584721123e56c5dc84ce | |
parent | a23db9bba0144007e6373a28c564908d2029ab01 (diff) |
partial_sim: Fix free(geomfile)
-rw-r--r-- | libcrystfel/src/stream.c | 2 | ||||
-rw-r--r-- | src/partial_sim.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 808be152..e7062e25 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -1043,6 +1043,8 @@ void write_geometry_file(Stream *st, const char *geom_filename) { FILE *geom_fh; char *rval; + if ( geom_filename == NULL ) return; + geom_fh = fopen(geom_filename, "r"); if ( geom_fh == NULL ) { ERROR("Failed to read detector geometry from " diff --git a/src/partial_sim.c b/src/partial_sim.c index a113532b..ebff2e20 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -646,7 +646,6 @@ int main(int argc, char *argv[]) ERROR("Failed to read geometry from '%s'\n", geomfile); return 1; } - free(geomfile); if ( sym_str == NULL ) sym_str = strdup("1"); sym = get_pointgroup(sym_str); @@ -845,6 +844,7 @@ int main(int argc, char *argv[]) free_symoplist(sym); reflist_free(full); free(save_file); + free(geomfile); return 0; } |