Convert existing usage of assert() to ossl_assert() in libssl

[openssl.git] / ssl / ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index cba03bdc15df1ab0edb5bfb562cd11327f8c3e9a..028b69da08b89b3471f45728ffb0a353ed21c80e 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -39,7 +39,6 @@
  * OTHERWISE.
  */
 
  * OTHERWISE.
  */
 

-#include <assert.h>

 #include <stdio.h>
 #include "ssl_locl.h"
 #include <openssl/objects.h>
 #include <stdio.h>
 #include "ssl_locl.h"
 #include <openssl/objects.h>


@@ -493,8 +492,10 @@ int SSL_clear(SSL *s)
         s->method = s->ctx->method;
         if (!s->method->ssl_new(s))
             return 0;
         s->method = s->ctx->method;
         if (!s->method->ssl_new(s))
             return 0;

-    } else
-        s->method->ssl_clear(s);
+    } else {
+        if (!s->method->ssl_clear(s))
+            return 0;
+    }

 
     RECORD_LAYER_clear(&s->rlayer);
 
 
     RECORD_LAYER_clear(&s->rlayer);
 


@@ -981,6 +982,7 @@ void SSL_free(SSL *s)
     dane_final(&s->dane);
     CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
 
     dane_final(&s->dane);
     CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
 

+    /* Ignore return value */

     ssl_free_wbio_buffer(s);
 
     BIO_free_all(s->wbio);
     ssl_free_wbio_buffer(s);
 
     BIO_free_all(s->wbio);


@@ -3529,16 +3531,19 @@ int ssl_init_wbio_buffer(SSL *s)
     return 1;
 }
 
     return 1;
 }
 

-void ssl_free_wbio_buffer(SSL *s)
+int ssl_free_wbio_buffer(SSL *s)

 {
     /* callers ensure s is never null */
     if (s->bbio == NULL)
 {
     /* callers ensure s is never null */
     if (s->bbio == NULL)

-        return;
+        return 1;

 
     s->wbio = BIO_pop(s->wbio);
 
     s->wbio = BIO_pop(s->wbio);

-    assert(s->wbio != NULL);
+    if (!ossl_assert(s->wbio != NULL))
+        return 0;

     BIO_free(s->bbio);
     s->bbio = NULL;
     BIO_free(s->bbio);
     s->bbio = NULL;

+
+    return 1;

 }
 
 void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode)
 }
 
 void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode)