commit cca4ba7611ecc6761e2178f39cc9a68e7f5a4911
author David Benjamin <davidben@chromium.org> Wed Apr 22 15:49:27 2015 -0400
committer Adam Langley <agl@google.com> Mon May 04 23:12:04 2015 +0000
tree 1cfdb2c7e97e0a0d2e055e7fb79ebd99618b8006
parent cfaf7ff9bf877239f17c805af6a3d7daae48e0a2

Remove unnecessary NULL checks, part 3.

Finish up the e's.

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

crypto/err/err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index e7cbbc8..53ec538 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -135,7 +135,7 @@
 
 /* err_clear_data frees the optional |data| member of the given error. */
 static void err_clear_data(struct err_error_st *error) {
-  if (error->data != NULL && (error->flags & ERR_FLAG_MALLOCED) != 0) {
+  if ((error->flags & ERR_FLAG_MALLOCED) != 0) {
     OPENSSL_free(error->data);
   }
   error->data = NULL;
@@ -167,9 +167,7 @@
   for (i = 0; i < ERR_NUM_ERRORS; i++) {
     err_clear(&state->errors[i]);
   }
-  if (state->to_free) {
-    OPENSSL_free(state->to_free);
-  }
+  OPENSSL_free(state->to_free);
   OPENSSL_free(state);
 }
 
@@ -242,9 +240,7 @@
        * error queue. */
       if (inc) {
         if (error->flags & ERR_FLAG_MALLOCED) {
-          if (state->to_free) {
-            OPENSSL_free(state->to_free);
-          }
+          OPENSSL_free(state->to_free);
           state->to_free = error->data;
         }
         error->data = NULL;
@@ -312,10 +308,8 @@
   for (i = 0; i < ERR_NUM_ERRORS; i++) {
     err_clear(&state->errors[i]);
   }
-  if (state->to_free) {
-    OPENSSL_free(state->to_free);
-    state->to_free = NULL;
-  }
+  OPENSSL_free(state->to_free);
+  state->to_free = NULL;
 
   state->top = state->bottom = 0;
 }