Merge pull request #238 from nasa/211-sa-ptr-memory-leak-pr

[#211] Modify sadb_get_sa_from_spi. Unnecessary NULL
nasa · May 2, 2024 · 318c371 · 318c371
2 parents fb72ee2 + d28cb6e
commit 318c371
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/sa/internal/sa_interface_inmemory.template.c b/src/sa/internal/sa_interface_inmemory.template.c
@@ -435,16 +435,13 @@ static int32_t sa_close(void)
 static int32_t sa_get_from_spi(uint16_t spi, SecurityAssociation_t** security_association)
 {
     int32_t status = CRYPTO_LIB_SUCCESS;
-    if (sa == NULL)
-    {
-        return CRYPTO_LIB_ERR_NO_INIT;
-    }
     *security_association = &sa[spi];
-    if (sa[spi].iv == NULL && (sa[spi].shivf_len > 0) && crypto_config.cryptography_type != CRYPTOGRAPHY_TYPE_KMCCRYPTO)
+    if ((sa[spi].iv == NULL) && (sa[spi].shivf_len > 0) && crypto_config.cryptography_type != CRYPTOGRAPHY_TYPE_KMCCRYPTO)
     {
         return CRYPTO_LIB_ERR_NULL_IV;
     } // Must have IV if doing encryption or authentication
-    if (sa[spi].abm == NULL && sa[spi].ast)
+
+    if ((sa[spi].abm_len == 0) && sa[spi].ast)
     {
         return CRYPTO_LIB_ERR_NULL_ABM;
     } // Must have abm if doing authentication