Merge branch 'dapsnet'

Alexander Avramenko · Alexander Avramenko · commit 7f75682b6e67 · 2019-08-29T15:35:30.000+03:00
diff --git a/solver/src/solverinterface.cpp b/solver/src/solverinterface.cpp
@@ -262,7 +262,7 @@ void SolverCore::gotStageThree(const cs::StageThree& stage, const uint8_t flagg)
         }
 		bool invalidRealTrustedMask = false;
         if (!(stageFrom.realTrustedMask == stageTo.realTrustedMask) || stageTo.realTrustedMask[stageFrom.sender] == cs::ConfidantConsts::InvalidConfidantIndex) {
-			bool invalidRealTrustedMask = false;
+			invalidRealTrustedMask = true;
         }
 		bool invalidWriter = false;
         if (!(stageFrom.writer == stageTo.writer)) {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ void SolverCore::gotStageThree(const cs::StageThree& stage, const uint8_t flagg)`
`262`	`262`	`}`
`263`	`263`	`bool invalidRealTrustedMask = false;`
`264`	`264`	`if (!(stageFrom.realTrustedMask == stageTo.realTrustedMask) \|\| stageTo.realTrustedMask[stageFrom.sender] == cs::ConfidantConsts::InvalidConfidantIndex) {`
`265`		`- bool invalidRealTrustedMask = false;`
	`265`	`+ invalidRealTrustedMask = true;`
`266`	`266`	`}`
`267`	`267`	`bool invalidWriter = false;`
`268`	`268`	`if (!(stageFrom.writer == stageTo.writer)) {`