Call of memcmp with null pointers in obj_cmp()

[oweals/openssl.git] / test / dhtest.c

diff --git a/test/dhtest.c b/test/dhtest.c
index 8f71723b31430beea6cf536ea1f60496ed30d018..7e46166eeba9c11326fc16115aad3fcbadce8b0e 100644 (file)
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -195,10 +195,8 @@ int main(int argc, char *argv[])
  err:
     ERR_print_errors_fp(stderr);
 
-    if (abuf != NULL)
-        OPENSSL_free(abuf);
-    if (bbuf != NULL)
-        OPENSSL_free(bbuf);
+    OPENSSL_free(abuf);
+    OPENSSL_free(bbuf);
     DH_free(b);
     DH_free(a);
     BN_GENCB_free(_cb);
@@ -487,7 +485,7 @@ static const rfc5114_td rfctd[] = {
 static int run_rfc5114_tests(void)
 {
     int i;
-    for (i = 0; i < (int)(sizeof(rfctd) / sizeof(rfc5114_td)); i++) {
+    for (i = 0; i < (int)OSSL_NELEM(rfctd); i++) {
         DH *dhA, *dhB;
         unsigned char *Z1 = NULL, *Z2 = NULL;
         const rfc5114_td *td = rfctd + i;