You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
As mentioned in #69 (comment), the check for this == NULL in a member function does not seem to work. You should just not call a function that is a member of an object if that object does not exist.
These checks should appear before the IsEqual is called, or the functions are moved out of the class.
I started to patch this up with
diff --git a/OS/src/OSCommonInterfaces/OSResult.cpp b/OS/src/OSCommonInterfaces/OSResult.cpp
index a73f9617..6db3d1c3 100644
--- a/OS/src/OSCommonInterfaces/OSResult.cpp+++ b/OS/src/OSCommonInterfaces/OSResult.cpp@@ -7516,9 +7516,25 @@ bool OSResult::IsEqual(OSResult *that)
return false;
if (!this->system->IsEqual(that->system))
return false;
- if (!this->service->IsEqual(that->service))+ if ((this->service != NULL) != (that->service != NULL))+ {+#ifndef NDEBUG+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Differences in GeneralResult");+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Second object ServiceResult is NULL, first is not, or the other way around");+#endif+ return false;+ }+ if (this->service != NULL && !this->service->IsEqual(that->service))
return false;
- if (!this->job->IsEqual(that->job))+ if ((this->job != NULL) != (that->job != NULL))+ {+#ifndef NDEBUG+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Differences in GeneralResult");+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Second object Job is NULL, first is not, or the other way around");+#endif+ return false;+ }+ if (this->job != NULL && !this->job->IsEqual(that->job))
return false;
if (!this->optimization->IsEqual(that->optimization))
return false;
@@ -7584,9 +7600,25 @@ bool GeneralResult::IsEqual(GeneralResult *that)
return false;
}
- if (!this->generalStatus->IsEqual(that->generalStatus))+ if ((this->generalStatus != NULL) != (that->generalStatus != NULL))+ {+#ifndef NDEBUG+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Differences in GeneralResult");+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Second object generalStatus is NULL, first is not, or the other way around");+#endif+ return false;+ }+ if (this->generalStatus != NULL && !this->generalStatus->IsEqual(that->generalStatus))
return false;
- if (!this->otherResults->IsEqual(that->otherResults))+ if ((this->otherResults != NULL) != (that->otherResults != NULL))+ {+#ifndef NDEBUG+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Differences in OtherResults");+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Second object otherResults is NULL, first is not, or the other way around");+#endif+ return false;+ }+ if (this->otherResults != NULL && !this->otherResults->IsEqual(that->otherResults))
return false;
return true;
}
@@ -8254,9 +8286,25 @@ bool OptimizationSolution::IsEqual(OptimizationSolution *that)
if (!this->status->IsEqual(that->status))
return false;
- if (!this->variables->IsEqual(that->variables))+ if ((this->variables != NULL) != (that->variables != NULL))+ {+#ifndef NDEBUG+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Differences in OptimizationSolution");+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Second object VariablesSolution is NULL, first is not, or the other way around");+#endif+ return false;+ }+ if (this->variables != NULL && !this->variables->IsEqual(that->variables))
return false;
- if (!this->objectives->IsEqual(that->objectives))+ if ((this->objectives != NULL) != (that->objectives != NULL))+ {+#ifndef NDEBUG+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Differences in OptimizationSolution");+ osoutput->OSPrint(ENUM_OUTPUT_AREA_OSResult, ENUM_OUTPUT_LEVEL_debug, "Second object Objectives is NULL, first is not, or the other way around");+#endif+ return false;+ }+ if (this->objectives != NULL && !this->objectives->IsEqual(that->objectives))
return false;
if (!this->constraints->IsEqual(that->constraints))
return false;
but then gave up and only disabled the test that was failing: 588350e. This should be undone when this issue gets fixed properly.
The text was updated successfully, but these errors were encountered:
As mentioned in #69 (comment), the check for
this == NULL
in a member function does not seem to work. You should just not call a function that is a member of an object if that object does not exist.These checks should appear before the
IsEqual
is called, or the functions are moved out of the class.I started to patch this up with
but then gave up and only disabled the test that was failing: 588350e. This should be undone when this issue gets fixed properly.
The text was updated successfully, but these errors were encountered: