aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2019-07-17 14:54:00 +0200
committerThomas White <taw@physics.org>2019-07-17 14:54:00 +0200
commitf25b274603861b2eaecbf995493b79530b69d6a9 (patch)
tree7e7a48b77c2c356395b3464323f96503cb008053 /libcrystfel
parent2b2d41cd933bb1015fbf95b63dd8ec3c990b0767 (diff)
parent8b3f748a90421152b364be5170415ee4e0a3b329 (diff)
Merge branch 'tom/zmq'
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/image.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index c7069faa..44ef2774 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -1178,6 +1178,8 @@ enum imagefile_type imagefile_get_type(struct imagefile *f)
struct hdfile *imagefile_get_hdfile(struct imagefile *f)
{
+ if ( f == NULL ) return NULL;
+
if ( f->type != IMAGEFILE_HDF5 ) {
ERROR("Not an HDF5 file!\n");
return NULL;