From 65546f0a191be894f0a14cf30d915587f89e0f42 Mon Sep 17 00:00:00 2001
From: A13501350 <18516149786@163.com>
Date: Tue, 21 Oct 2025 00:02:29 +0800
Subject: [PATCH] fix: SonarCloud issues

---
 .github/workflows/test-ci-windows.yml |  3 +++
 iis/mymodule.cpp                      | 23 +++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-ci-windows.yml b/.github/workflows/test-ci-windows.yml
index d2c0eb27..405a1186 100644
--- a/.github/workflows/test-ci-windows.yml
+++ b/.github/workflows/test-ci-windows.yml
@@ -84,6 +84,8 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         prefix: vcpkg-iis-module-${{ matrix.arch }}/
 
+    - uses: ammaraskar/msvc-problem-matcher@master
+
     - name: Configure CMake for IIS Module
       env:
         VCPKG_FEATURE_FLAGS: "binarycaching"
@@ -248,6 +250,7 @@ jobs:
         Restart-Service W3SVC -Force
 
         $modules = & "$env:SystemRoot\system32\inetsrv\appcmd.exe" list modules
+        Write-Host "IIS modules: $modules"
         if ($LASTEXITCODE -ne 0) {
             Write-Error "appcmd failed with exit code $LASTEXITCODE"
             exit 1
diff --git a/iis/mymodule.cpp b/iis/mymodule.cpp
index 7e29933b..dfaee4b2 100644
--- a/iis/mymodule.cpp
+++ b/iis/mymodule.cpp
@@ -18,7 +18,6 @@
 #define inline inline
 
 #include "winsock2.h"
-#include <Ws2tcpip.h>
 
 //  IIS7 Server API header file
 #include <Windows.h>
@@ -91,19 +90,19 @@ class REQUEST_STORED_CONTEXT : public IHttpStoredContext
 
 char *GetIpAddr(apr_pool_t *pool, PSOCKADDR pAddr)
 {
-    if (pAddr == NULL) {
-        return "";
+    if (pAddr == nullptr) {
+        return apr_pstrdup(pool, "");
     }
     
     DWORD addrSize = pAddr->sa_family == AF_INET ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6);
-    char* buf = (char*)apr_palloc(pool, NI_MAXHOST);
-    if (buf == NULL) {
-        return "";
+    auto buf = (char*)apr_palloc(pool, NI_MAXHOST);
+    if (buf == nullptr) {
+        return apr_pstrdup(pool, "");
     }
     buf[0] = '\0';
     
-    if (GetNameInfo(pAddr, addrSize, buf, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) != 0) {
-        return "";
+    if (GetNameInfo(pAddr, addrSize, buf, NI_MAXHOST, nullptr, 0, NI_NUMERICHOST) != 0) {
+        return apr_pstrdup(pool, "");
     }
     
     return buf;
@@ -119,18 +118,18 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
     addr->family = AF_UNSPEC;
     addr->addr_str_len = 0;
     addr->ipaddr_len = 0;
-    addr->ipaddr_ptr = NULL;
+    addr->ipaddr_ptr = nullptr;
     addr->salen = 0;
     addr->port = 0;
 
-	if (pAddr == NULL) {
+	if (pAddr == nullptr) {
 		return addr;
 	}
 
 	addr->family = pAddr->sa_family;
 
 	if (pAddr->sa_family == AF_INET) {
-		SOCKADDR_IN *sin = (SOCKADDR_IN *)pAddr;
+		auto sin = (SOCKADDR_IN *)pAddr;
 		addr->addr_str_len = INET_ADDRSTRLEN;
 		addr->ipaddr_len = sizeof(struct in_addr);
 		addr->ipaddr_ptr = &addr->sa.sin.sin_addr;
@@ -141,7 +140,7 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
 		addr->salen = sizeof(addr->sa);
 		addr->port = ntohs(sin->sin_port);
 	} else if (pAddr->sa_family == AF_INET6) {
-		SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)pAddr;
+		auto sin6 = (SOCKADDR_IN6 *)pAddr;
 		addr->addr_str_len = INET6_ADDRSTRLEN;
 		addr->ipaddr_len = sizeof(struct in6_addr);
 		addr->ipaddr_ptr = &addr->sa.sin6.sin6_addr;