SVAVE: fix INVARIANT_RESULT.OP_ASSIGN, NULL_AFTER_DEREF

Change-Id: I9b5a4854f2ad9ff703e036425f7ccf09ea45c888

diff --git a/TEEStub/PropertyAccess/PropertyApi.cpp b/TEEStub/PropertyAccess/PropertyApi.cpp
index 9b85dc1..2a52fdf 100644 (file)
--- a/TEEStub/PropertyAccess/PropertyApi.cpp
+++ b/TEEStub/PropertyAccess/PropertyApi.cpp
@@ -351,9 +351,10 @@ void TEE_StartPropertyEnumerator(TEE_PropSetHandle enumerator,
                }\r
        }\r
 \r
-       newEnumHandle->property->setPropSet((uintptr_t)propSet);\r
-       if (newEnumHandle && newEnumHandle->property)\r
-               newEnumHandle->property->start();\r
+       if (newEnumHandle && newEnumHandle->property) {\r
+               newEnumHandle->property->setPropSet((uintptr_t)propSet);\r
+               newEnumHandle->property->start();
+       }\r
 }\r
 \r
 void TEE_ResetPropertyEnumerator(TEE_PropSetHandle enumerator) {\r

diff --git a/ssflib/dep/cryptocore/source/base/cc_bignum.c b/ssflib/dep/cryptocore/source/base/cc_bignum.c
index d9175ec..3d4a1b6 100644 (file)
--- a/ssflib/dep/cryptocore/source/base/cc_bignum.c
+++ b/ssflib/dep/cryptocore/source/base/cc_bignum.c
@@ -2879,7 +2879,7 @@ int       SDRM_HEX2BN(cc_u8* pbSrc, SDRM_BIG_NUM *BN_Dst)
                        {
                                case '0':
                                        BN_Dst->pData[i] = BN_Dst->pData[i] << 4;
-                                       BN_Dst->pData[i] |= 0x0;
+                                       //BN_Dst->pData[i] |= 0x0; Unnecessary
                                        break;
                                case '1':
                                        BN_Dst->pData[i] = BN_Dst->pData[i] << 4;