]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
rpc: don't destroy xdr before creating it in virNetMessageEncodeHeader
authorJán Tomko <jtomko@redhat.com>
Thu, 29 Nov 2012 10:50:09 +0000 (11:50 +0100)
committerEric Blake <eblake@redhat.com>
Thu, 29 Nov 2012 17:10:08 +0000 (10:10 -0700)
On OOM, xdr_destroy got called even though it wasn't created yet.

Found by coverity:
Error: UNINIT (CWE-457):
    libvirt-0.10.2/src/rpc/virnetmessage.c:214: var_decl: Declaring
    variable "xdr" without initializer.
    libvirt-0.10.2/src/rpc/virnetmessage.c:219: cond_true: Condition
    "virReallocN(&msg->buffer, 1UL /* sizeof (*msg->buffer) */,
    msg->bufferLength) < 0", taking true branch
    libvirt-0.10.2/src/rpc/virnetmessage.c:221: goto: Jumping to label
    "cleanup"
    libvirt-0.10.2/src/rpc/virnetmessage.c:257: label: Reached label
    "cleanup"
    libvirt-0.10.2/src/rpc/virnetmessage.c:258: uninit_use: Using
    uninitialized value "xdr.x_ops".

src/rpc/virnetmessage.c

index ce5f9d8de776f8675261c58dd35cacbffceacfb1..2fbd603968deb4c6d60e954ecddbda969415730a 100644 (file)
@@ -218,7 +218,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg)
     msg->bufferLength = VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX;
     if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) {
         virReportOOMError();
-        goto cleanup;
+        return ret;
     }
     msg->bufferOffset = 0;