summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-08-15 11:20:57 +0000
committertb <>2023-08-15 11:20:57 +0000
commit71713846df0b1574c02eede181ea8d7f048449f0 (patch)
treec09cba9f1650c50d0841141e9c32aa16941e3c6d
parentaf64da648e0db3c26a7d488bab5faa5fb0dfa940 (diff)
downloadopenbsd-71713846df0b1574c02eede181ea8d7f048449f0.tar.gz
openbsd-71713846df0b1574c02eede181ea8d7f048449f0.tar.bz2
openbsd-71713846df0b1574c02eede181ea8d7f048449f0.zip
Avoid memcmp() with NULL pointer and 0 length
-rw-r--r--src/regress/lib/libssl/ssl/ssltest.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/ssl/ssltest.c b/src/regress/lib/libssl/ssl/ssltest.c
index f50824d242..f95ea44a91 100644
--- a/src/regress/lib/libssl/ssl/ssltest.c
+++ b/src/regress/lib/libssl/ssl/ssltest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssltest.c,v 1.42 2023/07/27 07:08:09 tb Exp $ */ 1/* $OpenBSD: ssltest.c,v 1.43 2023/08/15 11:20:57 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -281,8 +281,8 @@ verify_alpn(SSL *client, SSL *server)
281 free(alpn_selected); 281 free(alpn_selected);
282 alpn_selected = NULL; 282 alpn_selected = NULL;
283 283
284 if (client_proto_len != server_proto_len || 284 if (client_proto_len != server_proto_len || (client_proto_len > 0 &&
285 memcmp(client_proto, server_proto, client_proto_len) != 0) { 285 memcmp(client_proto, server_proto, client_proto_len) != 0)) {
286 BIO_printf(bio_stdout, "ALPN selected protocols differ!\n"); 286 BIO_printf(bio_stdout, "ALPN selected protocols differ!\n");
287 goto err; 287 goto err;
288 } 288 }