Skip to content

Commit

Permalink
BUG: Address buffer overflow with deprecated GDCM1 interface
Browse files Browse the repository at this point in the history 
Add string buffer length argument to methods using C strings for
output.
  • Loading branch information
@blowekamp
blowekamp committed Oct 29, 2019
1 parent e620a94 commit 49c4663
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 64 deletions.
32 changes: 16 additions & 16 deletions Modules/IO/GDCM/include/itkGDCMImageIO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,52 +183,52 @@ class ITKIOGDCM_EXPORT GDCMImageIO : public ImageIOBase
* Instead user are encourage to use directly the GetValueFromTag function
*/
void
GetPatientName(char * name);
GetPatientName(char * name, size_t len = 512);

void
GetPatientID(char * id);
GetPatientID(char * id, size_t len = 512);

void
GetPatientSex(char * sex);
GetPatientSex(char * sex, size_t len = 512);

void
GetPatientAge(char * age);
GetPatientAge(char * age, size_t len = 512);

void
GetStudyID(char * id);
GetStudyID(char * id, size_t len = 512);

void
GetPatientDOB(char * dob);
GetPatientDOB(char * dob, size_t len = 512);

void
GetStudyDescription(char * desc);
GetStudyDescription(char * desc, size_t len = 512);

void
GetBodyPart(char * part);
GetBodyPart(char * part, size_t len = 512);

void
GetNumberOfSeriesInStudy(char * series);
GetNumberOfSeriesInStudy(char * series, size_t len = 512);

void
GetNumberOfStudyRelatedSeries(char * series);
GetNumberOfStudyRelatedSeries(char * series, size_t len = 512);

void
GetStudyDate(char * date);
GetStudyDate(char * date, size_t len = 512);

void
GetModality(char * modality);
GetModality(char * modality, size_t len = 512);

void
GetManufacturer(char * manu);
GetManufacturer(char * manu, size_t len = 512);

void
GetInstitution(char * ins);
GetInstitution(char * ins, size_t len = 512);

void
GetModel(char * model);
GetModel(char * model, size_t len = 512);

void
GetScanOptions(char * options);
GetScanOptions(char * options, size_t len = 512);
#endif

/** More general method to retrieve an arbitrary DICOM value based
Expand Down
112 changes: 64 additions & 48 deletions Modules/IO/GDCM/src/itkGDCMImageIO.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,22 +693,22 @@ GDCMImageIO::InternalReadImageInformation()
#if defined(ITKIO_DEPRECATED_GDCM1_API)
// Now is a good time to fill in the class member:
char name[512];
this->GetPatientName(name);
this->GetPatientID(name);
this->GetPatientSex(name);
this->GetPatientAge(name);
this->GetStudyID(name);
this->GetPatientDOB(name);
this->GetStudyDescription(name);
this->GetBodyPart(name);
this->GetNumberOfSeriesInStudy(name);
this->GetNumberOfStudyRelatedSeries(name);
this->GetStudyDate(name);
this->GetModality(name);
this->GetManufacturer(name);
this->GetInstitution(name);
this->GetModel(name);
this->GetScanOptions(name);
this->GetPatientName(name, 512);
this->GetPatientID(name, 512);
this->GetPatientSex(name, 512);
this->GetPatientAge(name, 512);
this->GetStudyID(name, 512);
this->GetPatientDOB(name, 512);
this->GetStudyDescription(name, 512);
this->GetBodyPart(name, 512);
this->GetNumberOfSeriesInStudy(name, 512);
this->GetNumberOfStudyRelatedSeries(name, 512);
this->GetStudyDate(name, 512);
this->GetModality(name, 512);
this->GetManufacturer(name, 512);
this->GetInstitution(name, 512);
this->GetModel(name, 512);
this->GetScanOptions(name, 512);
#endif
}

Expand Down Expand Up @@ -1301,147 +1301,163 @@ GDCMImageIO::Write(const void * buffer)
// Convenience methods to query patient and scanner information. These
// methods are here for compatibility with the DICOMImageIO2 class.
void
GDCMImageIO::GetPatientName(char * name)
GDCMImageIO::GetPatientName(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0010|0010", m_PatientName);
strcpy(name, m_PatientName.c_str());
strncpy(name, m_PatientName.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetPatientID(char * name)
GDCMImageIO::GetPatientID(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0010|0020", m_PatientID);
strcpy(name, m_PatientID.c_str());
strncpy(name, m_PatientID.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetPatientSex(char * name)
GDCMImageIO::GetPatientSex(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0010|0040", m_PatientSex);
strcpy(name, m_PatientSex.c_str());
strncpy(name, m_PatientSex.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetPatientAge(char * name)
GDCMImageIO::GetPatientAge(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0010|1010", m_PatientAge);
strcpy(name, m_PatientAge.c_str());
strncpy(name, m_PatientAge.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetStudyID(char * name)
GDCMImageIO::GetStudyID(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0020|0010", m_StudyID);
strcpy(name, m_StudyID.c_str());
strncpy(name, m_StudyID.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetPatientDOB(char * name)
GDCMImageIO::GetPatientDOB(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0010|0030", m_PatientDOB);
strcpy(name, m_PatientDOB.c_str());
strncpy(name, m_PatientDOB.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetStudyDescription(char * name)
GDCMImageIO::GetStudyDescription(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0008|1030", m_StudyDescription);
strcpy(name, m_StudyDescription.c_str());
strncpy(name, m_StudyDescription.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetBodyPart(char * name)
GDCMImageIO::GetBodyPart(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0018|0015", m_BodyPart);
strcpy(name, m_BodyPart.c_str());
strncpy(name, m_BodyPart.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetNumberOfSeriesInStudy(char * name)
GDCMImageIO::GetNumberOfSeriesInStudy(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0020|1000", m_NumberOfSeriesInStudy);
strcpy(name, m_NumberOfSeriesInStudy.c_str());
strncpy(name, m_NumberOfSeriesInStudy.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetNumberOfStudyRelatedSeries(char * name)
GDCMImageIO::GetNumberOfStudyRelatedSeries(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0020|1206", m_NumberOfStudyRelatedSeries);
strcpy(name, m_NumberOfStudyRelatedSeries.c_str());
strncpy(name, m_NumberOfStudyRelatedSeries.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetStudyDate(char * name)
GDCMImageIO::GetStudyDate(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0008|0020", m_StudyDate);
strcpy(name, m_StudyDate.c_str());
strncpy(name, m_StudyDate.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetModality(char * name)
GDCMImageIO::GetModality(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0008|0060", m_Modality);
strcpy(name, m_Modality.c_str());
strncpy(name, m_Modality.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetManufacturer(char * name)
GDCMImageIO::GetManufacturer(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0008|0070", m_Manufacturer);
strcpy(name, m_Manufacturer.c_str());
strncpy(name, m_Manufacturer.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetInstitution(char * name)
GDCMImageIO::GetInstitution(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0008|0080", m_Institution);
strcpy(name, m_Institution.c_str());
strncpy(name, m_Institution.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetModel(char * name)
GDCMImageIO::GetModel(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0008|1090", m_Model);
strcpy(name, m_Model.c_str());
strncpy(name, m_Model.c_str(), len);
name[len - 1] = '\0';
}

void
GDCMImageIO::GetScanOptions(char * name)
GDCMImageIO::GetScanOptions(char * name, size_t len)
{
MetaDataDictionary & dict = this->GetMetaDataDictionary();

ExposeMetaData<std::string>(dict, "0018|0022", m_ScanOptions);
strcpy(name, m_ScanOptions.c_str());
strncpy(name, m_ScanOptions.c_str(), len);
name[len - 1] = '\0';
}
#endif

Expand Down

0 comments on commit 49c4663

Please sign in to comment.