Merge pull request #323 from pymumu/master

Fork Sync
PikuZheng · Sep 21, 2024 · 62e5f34 · 62e5f34
2 parents a65c090 + 84f217d
commit 62e5f34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/dns_client.c b/src/dns_client.c
@@ -4309,7 +4309,7 @@ static int _dns_client_pending_server_resolve(const struct dns_result *result, v
 	int has_soa = 0;
 
 	if (result->rtcode == DNS_RC_NXDOMAIN || result->has_soa == 1 || result->rtcode == DNS_RC_REFUSED ||
-		(result->rtcode == DNS_RC_NOERROR && result->ip_num == 0)) {
+		(result->rtcode == DNS_RC_NOERROR && result->ip_num == 0 && result->ip == NULL)) {
 		has_soa = 1;
 	}
 

diff --git a/src/dns_server.c b/src/dns_server.c
@@ -4411,7 +4411,10 @@ static int _dns_server_get_answer(struct dns_server_post_context *context)
 					continue;
 				}
 
-				_dns_server_context_add_ip(context, addr_map->ip_addr);
+				if (addr_map != NULL) {
+					_dns_server_context_add_ip(context, addr_map->ip_addr);
+				}
+
 				if (request->has_ip == 1) {
 					continue;
 				}