Selaa lähdekoodia

Remove a couple redundant NULL-checks before crypto_cipher_free

Calling crypto_cipher_free(NULL) is always safe, since (by
convention) all of our xyz_free() functions treat xyz_free(NULL) as
a no-op.

Flagged by coverity scan; fixes CID 508 and 509.
Nick Mathewson 13 vuotta sitten
vanhempi
commit
ab3197c059
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      src/common/crypto.c

+ 2 - 2
src/common/crypto.c

@@ -1055,7 +1055,7 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_t *env,
     memset(buf, 0, pkeylen);
     memset(buf, 0, pkeylen);
     tor_free(buf);
     tor_free(buf);
   }
   }
-  if (cipher) crypto_cipher_free(cipher);
+  crypto_cipher_free(cipher);
   return -1;
   return -1;
 }
 }
 
 
@@ -1112,7 +1112,7 @@ crypto_pk_private_hybrid_decrypt(crypto_pk_t *env,
  err:
  err:
   memset(buf,0,pkeylen);
   memset(buf,0,pkeylen);
   tor_free(buf);
   tor_free(buf);
-  if (cipher) crypto_cipher_free(cipher);
+  crypto_cipher_free(cipher);
   return -1;
   return -1;
 }
 }