aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-06-11 16:26:22 +0200
committerThomas White <taw@physics.org>2020-07-29 18:53:44 +0200
commit9f809658421e6f0280a68f846341170cf7596938 (patch)
tree397990b045bf39295f7220d10efc0bf828031b22 /libcrystfel/src
parenta0354c7b12c3203509bec884d56a0a90784b95a4 (diff)
Fix some memory bugs
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/image.c2
-rw-r--r--libcrystfel/src/stream.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index 478bb2d1..3efa2954 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -334,9 +334,9 @@ static double get_length(struct image *image, const char *from)
units = 1.0e-3;
} else {
units = unit_string_to_unit(sp+1);
+ sp[0] = '\0';
}
- sp[0] = '\0';
val = get_value(image, fromcpy);
free(fromcpy);
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c
index 1acddb70..ec49ec9d 100644
--- a/libcrystfel/src/stream.c
+++ b/libcrystfel/src/stream.c
@@ -1236,6 +1236,7 @@ Stream *stream_open_fd_for_write(int fd)
void stream_write_target_cell(Stream *st, const UnitCell *cell)
{
+ if ( cell == NULL ) return;
fprintf(st->fh, STREAM_CELL_START_MARKER"\n");
write_cell(cell, st->fh);
fprintf(st->fh, "; Please note: this is the target unit cell.\n");