# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1600368555 -7200
# Node ID 171af1567473f867389fd730e0049df5081b61cb
# Parent  d962a2996637cabf005e4e07d4135cc300a6cbca
cppcheck

diff -r d962a2996637 -r 171af1567473 OrthancServer/Resources/RunCppCheck.sh
--- a/OrthancServer/Resources/RunCppCheck.sh	Thu Sep 17 17:58:19 2020 +0200
+++ b/OrthancServer/Resources/RunCppCheck.sh	Thu Sep 17 20:49:15 2020 +0200
@@ -15,9 +15,11 @@
 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:309
 nullPointerRedundantCheck:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp
 stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1070
-stlFindInsert:../../OrthancServer/Sources/ServerIndex.cpp:398
+stlFindInsert:../../OrthancServer/Sources/ServerIndex.cpp:400
 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:50
 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:129
+syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:314
+uninitMemberVar:../../OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp:427
 unreadVariable:../../OrthancFramework/Sources/FileStorage/StorageAccessor.cpp
 unreadVariable:../../OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp:714
 useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:89
diff -r d962a2996637 -r 171af1567473 OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp
--- a/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp	Thu Sep 17 17:58:19 2020 +0200
+++ b/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp	Thu Sep 17 20:49:15 2020 +0200
@@ -217,11 +217,10 @@
                                    const Json::Value& serialized) :
     SetOfCommandsJob(new Unserializer(*this), serialized),
     context_(context),
+    parameters_(DicomAssociationParameters::UnserializeJob(serialized)),
+    targetAet_(SerializationToolbox::ReadString(serialized, TARGET_AET)),
     query_(Json::arrayValue)
   {
-    parameters_ = DicomAssociationParameters::UnserializeJob(serialized);
-    targetAet_ = SerializationToolbox::ReadString(serialized, TARGET_AET);
-
     if (serialized.isMember(QUERY) &&
         serialized[QUERY].type() == Json::arrayValue)
     {
diff -r d962a2996637 -r 171af1567473 OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp
--- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Thu Sep 17 17:58:19 2020 +0200
+++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Thu Sep 17 20:49:15 2020 +0200
@@ -274,7 +274,8 @@
     CleaningInstancesJob(context, true /* by default, keep source */),
     modification_(new DicomModification),
     isAnonymization_(false),
-    transcode_(false)
+    transcode_(false),
+    transferSyntax_(DicomTransferSyntax_LittleEndianExplicit)  // dummy initialization
   {
   }
 
diff -r d962a2996637 -r 171af1567473 OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp
--- a/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp	Thu Sep 17 17:58:19 2020 +0200
+++ b/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp	Thu Sep 17 20:49:15 2020 +0200
@@ -107,7 +107,8 @@
                   size_t index) :
       that_(that),
       index_(index),
-      hasFailureReason_(false)
+      hasFailureReason_(false),
+      failureReason_(StorageCommitmentFailureReason_Success)
     {
     }
 
@@ -426,11 +427,18 @@
   StorageCommitmentScpJob::StorageCommitmentScpJob(ServerContext& context,
                                                    const Json::Value& serialized) :
     SetOfCommandsJob(new Unserializer(*this), serialized),
-    context_(context)
+    context_(context),
+    transactionUid_(SerializationToolbox::ReadString(serialized, TRANSACTION_UID)),
+    calledAet_(SerializationToolbox::ReadString(serialized, CALLED_AET))
+    // "ready_" is initialized by the unserializer
   {
-    transactionUid_ = SerializationToolbox::ReadString(serialized, TRANSACTION_UID);
+    if (serialized.type() != Json::objectValue ||
+        !serialized.isMember(REMOTE_MODALITY))
+    {
+      throw OrthancException(ErrorCode_BadFileFormat);
+    }
+    
     remoteModality_ = RemoteModalityParameters(serialized[REMOTE_MODALITY]);
-    calledAet_ = SerializationToolbox::ReadString(serialized, CALLED_AET);
     SerializationToolbox::ReadArrayOfStrings(sopClassUids_, serialized, SOP_CLASS_UIDS);
     SerializationToolbox::ReadArrayOfStrings(sopInstanceUids_, serialized, SOP_INSTANCE_UIDS);
   }