commit 2755a3eda33684e05d90644aec25376e261506c4
author David Benjamin <davidben@chromium.org> Wed Apr 22 16:17:58 2015 -0400
committer Adam Langley <agl@google.com> Mon May 04 23:16:19 2015 +0000
tree af16d54922bf8f8b201ffbe3d0e3212910f5c5a3
parent d8b65c884423f271487f5ab080cbf12dba41f817

Remove unnecessary NULL checks, part 5.

Finally, the ssl stack.

Change-Id: Iea10e302825947da36ad46eaf3e8e2bce060fde2
Reviewed-on: https://boringssl-review.googlesource.com/4518
Reviewed-by: Adam Langley <agl@google.com>

ssl/ssl_asn1.c

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 3bca0c9..eb0c725 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -382,7 +382,7 @@
       OPENSSL_PUT_ERROR(SSL, d2i_SSL_SESSION, ERR_R_MALLOC_FAILURE);
       return 0;
     }
-  } else if (*out) {
+  } else {
     OPENSSL_free(*out);
     *out = NULL;
   }
@@ -526,10 +526,8 @@
   ret->time = session_time;
   ret->timeout = timeout;
 
-  if (ret->peer != NULL) {
-    X509_free(ret->peer);
-    ret->peer = NULL;
-  }
+  X509_free(ret->peer);
+  ret->peer = NULL;
   if (has_peer) {
     const uint8_t *ptr;
     ptr = CBS_data(&peer);
@@ -585,8 +583,6 @@
   return ret;
 
 err:
-  if (allocated) {
-    SSL_SESSION_free(allocated);
-  }
+  SSL_SESSION_free(allocated);
   return NULL;
 }