cherry-pick patchs list: 2ab8dba5 qemuDomainGetUnplugTimeout: Add G_GNUC_NO_INLINE 423664a6 virNetDevSwitchdevFeature: Make failure to get 'family_id' non-fatal ca616274 virNetDevGetFamilyId: Change signature 67b973b5 qemuDomainDefPostParse: Fail if unable to fill machine type 67e19fc9 qemu: Revoke access to mirror on failed blockcopy 93b15ba0 qemu: fix hang in p2p + xbzrle compression + parallel migration a13ac587 util: fix iteration in virSocketAddrResolveService 88011ed2 libxl: fix crash when initializing driver Signed-off-by: AlexChen <alex.chen@huawei.com>
31 lines
982 B
Diff
31 lines
982 B
Diff
From 9056229f9dff923406d97f0ac295bd502eaa5265 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
|
|
Date: Mon, 13 Apr 2020 16:48:43 +0300
|
|
Subject: [PATCH 2/8] util: fix iteration in virSocketAddrResolveService
|
|
|
|
getaddrinfo returns linked list. Fix iteration accordingly.
|
|
|
|
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
Signed-off-by: AlexChen <alex.chen@huawei.com>
|
|
---
|
|
src/util/virsocketaddr.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
|
|
index 4cad329d15..4c9f124e88 100644
|
|
--- a/src/util/virsocketaddr.c
|
|
+++ b/src/util/virsocketaddr.c
|
|
@@ -271,7 +271,7 @@ int virSocketAddrResolveService(const char *service)
|
|
port = ntohs(in.sin6_port);
|
|
goto cleanup;
|
|
}
|
|
- tmp++;
|
|
+ tmp = tmp->ai_next;
|
|
}
|
|
|
|
virReportError(VIR_ERR_SYSTEM_ERROR,
|
|
--
|
|
2.23.0
|
|
|