# HG changeset patch # User Sebastien Jodogne # Date 1779865407 -7200 # Node ID c6830eae85866c68ed55048c1d447db8c47ce95b # Parent e48f923cdab8d2c42b17b1191c21739f9863a531 added sanity check in OrthancGetRequestHandler diff -r e48f923cdab8 -r c6830eae8586 OrthancServer/Sources/OrthancGetRequestHandler.cpp --- a/OrthancServer/Sources/OrthancGetRequestHandler.cpp Tue May 26 21:36:47 2026 +0200 +++ b/OrthancServer/Sources/OrthancGetRequestHandler.cpp Wed May 27 09:03:27 2026 +0200 @@ -44,6 +44,24 @@ namespace Orthanc { + class OrthancGetRequestHandler::ReaderUserData : public IDynamicObject + { + private: + std::string instanceId_; + + public: + ReaderUserData(const std::string& instanceId) : + instanceId_(instanceId) + { + } + + const std::string& GetInstanceId() const + { + return instanceId_; + } + }; + + static void ProgressCallback(void *callbackData, T_DIMSE_StoreProgress *progress, T_DIMSE_C_StoreRQ *req) @@ -78,7 +96,20 @@ * (cf. "DataSourceSequentialReader::IValueDisconnector"). (*) **/ std::unique_ptr next(instancesLoader_->Next()); - assert(next.get() != NULL); + assert(next.get() != NULL && + next->HasUserData()); + + { + const std::string& expectedId = instancesIds_[position_]; + position_++; + + // This is just a sanity check, the class "ReaderUserData" could be removed + const ReaderUserData& userData = dynamic_cast(next->GetUserData()); + if (userData.GetInstanceId() != expectedId) + { + throw OrthancException(ErrorCode_InternalError); + } + } ParsedDicomFile& dicom = next->GetParsedDicomFile(); @@ -592,7 +623,7 @@ for (size_t i = 0; i < instancesIds_.size(); ++i) { - instancesLoader_->Submit(filesInfo[i]); + instancesLoader_->Submit(filesInfo[i], new ReaderUserData(instancesIds_[i])); } instancesLoader_->Start(); diff -r e48f923cdab8 -r c6830eae8586 OrthancServer/Sources/OrthancGetRequestHandler.h --- a/OrthancServer/Sources/OrthancGetRequestHandler.h Tue May 26 21:36:47 2026 +0200 +++ b/OrthancServer/Sources/OrthancGetRequestHandler.h Wed May 27 09:03:27 2026 +0200 @@ -37,6 +37,8 @@ class OrthancGetRequestHandler : public IGetRequestHandler { private: + class ReaderUserData; + ServerContext& context_; std::string localAet_; std::vector instancesIds_;