From fc95f04b10a68b4b1a38fa754d5074d26c12c827 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Mon, 22 Nov 1999 01:30:28 +0000 Subject: [PATCH] (php_ns_hash_environment) Ns_ConnHost() may return NULL, check for it --- sapi/aolserver/aolserver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 749ec4aad7..497c37a26c 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -300,6 +300,7 @@ php_ns_hash_environment(NSLS_D CLS_DC ELS_DC PLS_DC SLS_DC) int i; char buf[NS_BUF_SIZE + 1]; zval *pval; + char *tmp; for(i = 0; i < Ns_SetSize(NSG(conn->headers)); i++) { char *key = Ns_SetKey(NSG(conn->headers), i); @@ -352,8 +353,11 @@ php_ns_hash_environment(NSLS_D CLS_DC ELS_DC PLS_DC SLS_DC) snprintf(buf, NS_BUF_SIZE, "%d", Ns_ConnPort(NSG(conn))); ADD_STRING("SERVER_PORT"); - strncpy(buf, Ns_ConnHost(NSG(conn)), NS_BUF_SIZE); - ADD_STRING("SERVER_NAME"); + tmp = Ns_ConnHost(NSG(conn)); + if (tmp) { + strncpy(buf, tmp, NS_BUF_SIZE); + ADD_STRING("SERVER_NAME"); + } strncpy(buf, SG(request_info).path_translated, NS_BUF_SIZE); ADD_STRING("PATH_TRANSLATED"); -- 2.40.0