changeset 6871:c6830eae8586 streaming

added sanity check in OrthancGetRequestHandler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 27 May 2026 09:03:27 +0200
parents e48f923cdab8
children 305778086d85
files OrthancServer/Sources/OrthancGetRequestHandler.cpp OrthancServer/Sources/OrthancGetRequestHandler.h
diffstat 2 files changed, 35 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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<DicomSequentialReader::Item> 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<const ReaderUserData&>(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();
--- 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<std::string> instancesIds_;