Merge pull request #70 from bgilbert/fixes

Fix a crash and some error pile-ups on invalid files

Author: jcupitt

src/dicom-file.c

@@ -536,7 +536,7 @@ static DcmDataSet *dcm_filehandle_read_file_meta(DcmError **error,
                          false,
                          &parse,
                          filehandle)) {
-        return false;
+        return NULL;
     }
 
     /* Sanity check. We should have parsed a single dataset into the sequence
@@ -555,8 +555,8 @@ static DcmDataSet *dcm_filehandle_read_file_meta(DcmError **error,
     }
 
     DcmDataSet *file_meta = dcm_sequence_get(error, sequence, 0);
-    if (file_meta == NULL ) {
-        return false;
+    if (file_meta == NULL) {
+        return NULL;
     }
 
     // steal file_meta to stop it being destroyed
@@ -765,7 +765,7 @@ DcmDataSet *dcm_filehandle_read_metadata(DcmError **error,
                            filehandle->implicit,
                            &parse,
                            filehandle)) {
-        return false;
+        return NULL;
     }
 
     /* Sanity check. We should have parsed a single dataset into the sequence
@@ -784,8 +784,8 @@ DcmDataSet *dcm_filehandle_read_metadata(DcmError **error,
     }
 
     DcmDataSet *meta = dcm_sequence_get(error, sequence, 0);
-    if (meta == NULL ) {
-        return false;
+    if (meta == NULL) {
+        return NULL;
     }
 
     // steal meta to stop it being destroyed
@@ -821,6 +821,9 @@ const DcmDataSet *dcm_filehandle_get_metadata_subset(DcmError **error,
         DcmDataSet *meta = dcm_filehandle_read_metadata(error,
                                                         filehandle,
                                                         stop_tags);
+        if (meta == NULL) {
+            return NULL;
+        }
 
         // record the position of the tag that stopped the read
         if (!dcm_offset(error, filehandle, &filehandle->after_read_metadata)) {
@@ -838,7 +841,7 @@ const DcmDataSet *dcm_filehandle_get_metadata_subset(DcmError **error,
                 &filehandle->tiles_across, &filehandle->tiles_down) ||
             !set_pixel_description(error, meta, &filehandle->desc)) {
             dcm_dataset_destroy(meta);
-            return false;
+            return NULL;
         }
         filehandle->num_tiles = filehandle->tiles_across *
             filehandle->tiles_down;

src/dicom-parse.c

@@ -940,8 +940,10 @@ bool dcm_parse_pixeldata_offsets(DcmError **error,
         *first_frame_offset = position;
 
         // the next thing should be the tag for frame 1
-        if (!read_tag(&state, &tag, &position) ||
-            tag != TAG_ITEM) {
+        if (!read_tag(&state, &tag, &position)) {
+            return false;
+        }
+        if (tag != TAG_ITEM) {
             dcm_error_set(error, DCM_ERROR_CODE_PARSE,
                           "Reading Basic Offset Table failed",
                           "Basic Offset Table too large");
@@ -990,8 +992,10 @@ bool dcm_parse_pixeldata_offsets(DcmError **error,
         }
 
         // the next thing should be the end of sequence tag
-        if (!read_tag(&state, &tag, &position) ||
-            tag != TAG_SQ_DELIM) {
+        if (!read_tag(&state, &tag, &position)) {
+            return false;
+        }
+        if (tag != TAG_SQ_DELIM) {
             dcm_error_set(error, DCM_ERROR_CODE_PARSE,
                           "Reading Basic Offset Table failed",
                           "Too many frames in PixelData");