From d0e1bbdcf5a35b1f99260c7037ebfcdf229e0584 Mon Sep 17 00:00:00 2001 From: Henry Braun Date: Thu, 29 Aug 2019 12:41:16 -0500 Subject: [PATCH 1/3] Fix hardcoded maximum number of CSA tags --- nibabel/nicom/csareader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nibabel/nicom/csareader.py b/nibabel/nicom/csareader.py index 9847b72d28..f44d0a20c6 100644 --- a/nibabel/nicom/csareader.py +++ b/nibabel/nicom/csareader.py @@ -98,9 +98,9 @@ def read(csa_str): hdr_type = 1 csa_dict['type'] = hdr_type csa_dict['n_tags'], csa_dict['check'] = up_str.unpack('2I') - if not 0 < csa_dict['n_tags'] <= 128: + if not 0 < csa_dict['n_tags'] <= MAX_CSA_ITEMS: raise CSAReadError('Number of tags `t` should be ' - '0 < t <= 128') + '0 < t <= %s'%MAX_CSA_ITEMS) for tag_no in range(csa_dict['n_tags']): name, vm, vr, syngodt, n_items, last3 = \ up_str.unpack('64si4s3i') From 19aa45927bc44296f8bac0df5369654c6da8edde Mon Sep 17 00:00:00 2001 From: Henry Braun Date: Thu, 29 Aug 2019 12:51:08 -0500 Subject: [PATCH 2/3] fix some whitespace --- nibabel/nicom/csareader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nibabel/nicom/csareader.py b/nibabel/nicom/csareader.py index f44d0a20c6..a2d5a76b4d 100644 --- a/nibabel/nicom/csareader.py +++ b/nibabel/nicom/csareader.py @@ -100,7 +100,7 @@ def read(csa_str): csa_dict['n_tags'], csa_dict['check'] = up_str.unpack('2I') if not 0 < csa_dict['n_tags'] <= MAX_CSA_ITEMS: raise CSAReadError('Number of tags `t` should be ' - '0 < t <= %s'%MAX_CSA_ITEMS) + '0 < t <= %s' % MAX_CSA_ITEMS) for tag_no in range(csa_dict['n_tags']): name, vm, vr, syngodt, n_items, last3 = \ up_str.unpack('64si4s3i') From 250ccf893f448823e4240776e36de376bc864f3c Mon Sep 17 00:00:00 2001 From: Henry Braun Date: Tue, 3 Sep 2019 09:26:20 -0500 Subject: [PATCH 3/3] Update nibabel/nicom/csareader.py Co-Authored-By: Chris Markiewicz --- nibabel/nicom/csareader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nibabel/nicom/csareader.py b/nibabel/nicom/csareader.py index a2d5a76b4d..de2b5dbb1a 100644 --- a/nibabel/nicom/csareader.py +++ b/nibabel/nicom/csareader.py @@ -100,7 +100,7 @@ def read(csa_str): csa_dict['n_tags'], csa_dict['check'] = up_str.unpack('2I') if not 0 < csa_dict['n_tags'] <= MAX_CSA_ITEMS: raise CSAReadError('Number of tags `t` should be ' - '0 < t <= %s' % MAX_CSA_ITEMS) + '0 < t <= %d' % MAX_CSA_ITEMS) for tag_no in range(csa_dict['n_tags']): name, vm, vr, syngodt, n_items, last3 = \ up_str.unpack('64si4s3i')