From d3b6b81eab48c1b8ed4075a1818692f640fea999 Mon Sep 17 00:00:00 2001
From: Bartel Artem <artem.bartel@gmail.com>
Date: Wed, 29 Jan 2025 10:21:35 +0300
Subject: [PATCH] X509v3_addr_canonize(): Check whether addr == NULL

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26583)
---
 crypto/x509/v3_addr.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index d0e5f9efe60..519096714ca 100644
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -912,6 +912,11 @@ int X509v3_addr_canonize(IPAddrBlocks *addr)
 {
     int i;
 
+    if (addr == NULL) {
+        ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_NULL_ARGUMENT);
+        return 0;
+    }
+
     for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
         IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
 
-- 
2.47.2