3 files changed, 29 insertions, 2 deletions

diff --git a/src/regress/lib/libc/Makefile b/src/regress/lib/libc/Makefile
index 7012e12310..555b826e96 100644
--- a/src/regress/lib/libc/Makefile
+++ b/src/regress/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.63 2026/05/08 14:37:16 millert Exp $
+#       $OpenBSD: Makefile,v 1.64 2026/06/27 17:52:29 jca Exp $
 
 SUBDIR+= _setjmp
 SUBDIR+= alloca arc4random-fork atexit
@@ -7,7 +7,7 @@ SUBDIR+= cephes cxa-atexit
 SUBDIR+= db dirname
 SUBDIR+= elf_aux_info
 SUBDIR+= env explicit_bzero
-SUBDIR+= ffs fmemopen fnmatch fpclassify fread
+SUBDIR+= ffs fmemopen fnmatch fpclassify fread freeaddrinfo
 SUBDIR+= gcvt getaddrinfo getcap getopt getopt_long glob
 SUBDIR+= hash
 SUBDIR+= hsearch
diff --git a/src/regress/lib/libc/freeaddrinfo/Makefile b/src/regress/lib/libc/freeaddrinfo/Makefile
new file mode 100644
index 0000000000..f5ccd611eb
--- /dev/null
+++ b/src/regress/lib/libc/freeaddrinfo/Makefile
@@ -0,0 +1,5 @@
+#       $OpenBSD: Makefile,v 1.1 2026/06/27 17:52:29 jca Exp $
+
+PROG =          freeaddrinfo
+
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/freeaddrinfo/freeaddrinfo.c b/src/regress/lib/libc/freeaddrinfo/freeaddrinfo.c
new file mode 100644
index 0000000000..520ba6251e
--- /dev/null
+++ b/src/regress/lib/libc/freeaddrinfo/freeaddrinfo.c
@@ -0,0 +1,22 @@
+/* $OpenBSD: freeaddrinfo.c,v 1.1 2026/06/27 17:52:29 jca Exp $ */
+
+/* Public Domain */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netdb.h>
+
+#include <stddef.h>
+
+int
+main(void)
+{
+        /*
+         * The behavior of freeaddrinfo(NULL) isn't specified,
+         * but we want to gracefully handle it (ie avoid a crash).
+         */
+        freeaddrinfo(NULL);
+
+        return 0;
+}