Commit d916ba1b authored by Nils Larsch's avatar Nils Larsch
Browse files

check if con != NULL before using it

parent 33af4421

apps/s_client.c

+6 −2
Original line number Diff line number Diff line
@@ -1237,8 +1237,12 @@ shut: 
	SHUTDOWN(SSL_get_fd(con));

	ret=0;

end:

	if(prexit) print_stuff(bio_c_out,con,1);

	if (con != NULL) SSL_free(con);

	if (con != NULL)

		{

		if (prexit != 0)

			print_stuff(bio_c_out,con,1);

		SSL_free(con);

		}

	if (ctx != NULL) SSL_CTX_free(ctx);

	if (cert)

		X509_free(cert);

apps/s_server.c

+7 −4
Original line number Diff line number Diff line
@@ -1813,13 +1813,16 @@ again: 
			}

		}

err:

	if (con != NULL)

		{

		BIO_printf(bio_s_out,"shutting down SSL\n");

#if 1

		SSL_set_shutdown(con,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);

#else

		SSL_shutdown(con);

#endif

	if (con != NULL) SSL_free(con);

		SSL_free(con);

		}

	BIO_printf(bio_s_out,"CONNECTION CLOSED\n");

	if (buf != NULL)

		{