External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virfdstream: Use g_autofree in virFDStreamThreadDoRead()

Browse Source 
The buffer that allocated in the virFDStreamThreadDoRead() can be
automatically freed, or if saved into the message structure it
can be stolen.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2020-07-07 13:04:48 +02:00
parent 53d9af1e79
commit 8d5cae317e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/virfdstream.c
View File

@ -431,7 +431,7 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst,
virFDStreamMsgPtr msg = NULL;
int inData = 0;
long long sectionLen = 0;
char *buf = NULL;
g_autofree char *buf = NULL;
ssize_t got;
if (sparse && *dataLen == 0) {
@ -483,9 +483,8 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst,
}
msg->type = VIR_FDSTREAM_MSG_TYPE_DATA;
msg->stream.data.buf = buf;
msg->stream.data.buf = g_steal_pointer(&buf);
msg->stream.data.len = got;
buf = NULL;
if (sparse)
*dataLen -= got;
}
@ -496,7 +495,6 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst,
return got;
error:
VIR_FREE(buf);
virFDStreamMsgFree(msg);
return -1;
}