46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
|
From c07df2b480134357e6ecb53f61eb1d8295b2b406 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <c07df2b480134357e6ecb53f61eb1d8295b2b406@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Wed, 15 Feb 2023 10:43:53 +0100
|
||
|
|
Subject: [PATCH] rpc: client: Don't check return value of virNetMessageNew
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
virNetServerClientDispatchRead checked the return value but it's not
|
||
|
|
necessary any more as it can't return NULL nowadays.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
(cherry picked from commit 761cb8a0876d32445951791030c77afa147c0de1)
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2145188
|
||
|
|
---
|
||
|
|
src/rpc/virnetserverclient.c | 11 ++++-------
|
||
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
|
||
|
|
index c9a4eb521e..b5c764b1b0 100644
|
||
|
|
--- a/src/rpc/virnetserverclient.c
|
||
|
|
+++ b/src/rpc/virnetserverclient.c
|
||
|
|
@@ -1257,13 +1257,10 @@ static virNetMessage *virNetServerClientDispatchRead(virNetServerClient *client)
|
||
|
|
|
||
|
|
/* Possibly need to create another receive buffer */
|
||
|
|
if (client->nrequests < client->nrequests_max) {
|
||
|
|
- if (!(client->rx = virNetMessageNew(true))) {
|
||
|
|
- client->wantClose = true;
|
||
|
|
- } else {
|
||
|
|
- client->rx->bufferLength = VIR_NET_MESSAGE_LEN_MAX;
|
||
|
|
- client->rx->buffer = g_new0(char, client->rx->bufferLength);
|
||
|
|
- client->nrequests++;
|
||
|
|
- }
|
||
|
|
+ client->rx = virNetMessageNew(true);
|
||
|
|
+ client->rx->bufferLength = VIR_NET_MESSAGE_LEN_MAX;
|
||
|
|
+ client->rx->buffer = g_new0(char, client->rx->bufferLength);
|
||
|
|
+ client->nrequests++;
|
||
|
|
} else if (!client->nrequests_warning) {
|
||
|
|
client->nrequests_warning = true;
|
||
|
|
VIR_WARN("Client hit max requests limit %zd. This may result "
|
||
|
|
--
|
||
|
|
2.39.1
|
||
|
|
|