diff --git a/nifti2/nifti_tool.c b/nifti2/nifti_tool.c index 3357a373..8d1935ee 100644 --- a/nifti2/nifti_tool.c +++ b/nifti2/nifti_tool.c @@ -208,6 +208,7 @@ static const char g_version[] = "2.13"; static const char g_version_date[] = "February 27, 2022"; static int g_debug = 1; +#include #include #include #include @@ -3860,16 +3861,6 @@ int modify_field(void * basep, size_t baselen, field_s * field, const char * dat return 1; } - /* every case below writes field->len elements at field->offset */ - if( field->offset < 0 || field->size < 0 || field->len < 0 || - (size_t)field->offset + (size_t)field->size * (size_t)field->len > baselen ) - { - fprintf(stderr,"** field '%s' (offset %d, %d x %d bytes) does not fit " - "in a %zu byte structure\n", - field->name, field->offset, field->len, field->size, baselen); - return 1; - } - switch( field->type ) { case DT_UNKNOWN: @@ -4021,6 +4012,7 @@ int modify_field(void * basep, size_t baselen, field_s * field, const char * dat case NT_DT_STRING: { + assert(field->offset + field->len <= baselen); (void)baselen; char * dest = (char *)basep + field->offset; nchars = dataLength; strncpy(dest, data, field->len); diff --git a/nifti2/nifti_tool.h b/nifti2/nifti_tool.h index f72579f6..f6f5c6fb 100644 --- a/nifti2/nifti_tool.h +++ b/nifti2/nifti_tool.h @@ -310,8 +310,8 @@ NI2_API int fill_hdr2_field_array(field_s * nh_fields); NI2_API int fill_nim1_field_array(field_s * nim_fields); NI2_API int fill_nim2_field_array(field_s * nim_fields); NI2_API int fill_ana_field_array(field_s * ah_fields); -NI2_API int modify_all_fields(void *basep, size_t baseplen, nt_opts *opts, field_s *fields, int flen); -NI2_API int modify_field (void * basep, size_t baseplen, field_s * field, const char * data); +NI2_API int modify_all_fields(void *basep, size_t baselen, nt_opts *opts, field_s *fields, int flen); +NI2_API int modify_field (void * basep, size_t baselen, field_s * field, const char * data); NI2_API int process_opts (int argc, const char * argv[], nt_opts * opts); NI2_API int remove_ext_list (nifti_image * nim, const char ** elist, int len); NI2_API int usage (const char * prog, int level); diff --git a/niftilib/nifti1_tool.c b/niftilib/nifti1_tool.c index a6fb0b3a..862867fb 100644 --- a/niftilib/nifti1_tool.c +++ b/niftilib/nifti1_tool.c @@ -162,6 +162,7 @@ static const char * g_history[] = static const char g_version[] = "version 1.24 (September 26, 2012)"; static int g_debug = 1; +#include #include #include #include @@ -2922,16 +2923,6 @@ int modify_field(void * basep, size_t baselen, field_s * field, const char * dat return 1; } - /* every case below writes field->len elements at field->offset */ - if( field->offset < 0 || field->size < 0 || field->len < 0 || - (size_t)field->offset + (size_t)field->size * (size_t)field->len > baselen ) - { - fprintf(stderr,"** field '%s' (offset %d, %d x %d bytes) does not fit " - "in a %zu byte structure\n", - field->name, field->offset, field->len, field->size, baselen); - return 1; - } - switch( field->type ) { case DT_UNKNOWN: @@ -3042,6 +3033,7 @@ int modify_field(void * basep, size_t baselen, field_s * field, const char * dat case NT_DT_STRING: { + assert(field->offset + field->len <= baselen); (void)baselen; char * dest = (char *)basep + field->offset; nchars = dataLength; strncpy(dest, data, field->len); diff --git a/niftilib/nifti1_tool.h b/niftilib/nifti1_tool.h index 50bbce5d..39e48dfe 100644 --- a/niftilib/nifti1_tool.h +++ b/niftilib/nifti1_tool.h @@ -140,8 +140,8 @@ int fill_field (field_s *fp, int type, int offset, int num, const char *na int fill_hdr_field_array(field_s * nh_fields); int fill_nim_field_array(field_s * nim_fields); int fill_ana_field_array(field_s * ah_fields); -int modify_all_fields(void *basep, size_t baseplen, nt_opts *opts, field_s *fields, int flen); -int modify_field (void * basep, size_t baseplen, field_s * field, const char * data); +int modify_all_fields(void *basep, size_t baselen, nt_opts *opts, field_s *fields, int flen); +int modify_field (void * basep, size_t baselen, field_s * field, const char * data); int process_opts (int argc, const char * argv[], nt_opts * opts); int remove_ext_list (nifti_image * nim, const char ** elist, int len); int usage (const char * prog, int level);