External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-16 12:44:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix two off-by-1 errors in read-big-pipe test

Browse Source 
When testPipeFeeder copies the XML document into the padded buffer, it
tells virStrcpy that 'xmlsize' bytes are available. This is under
reporting size by 1 byte, and as a result it fails to copy the trailing
'\n' replacing it with '\0'. The return value of virStrcpy wasn't
checked, but was reporting this truncation.

When testPipeFeeder then sends the padded buffer down the pipe, it asks
to send 'emptyspace + xmlsize + 1' bytes, which means it sends the data,
as well as the trailing '\0' terminator.

Both bugs combined mean it is sending '\0\0' as the last bytes, instead
of '\n' which was intended. When virFileReadAll reads data from the
pipe, it ends up adding another '\0' resulting in a very NUL terminated
string ('\0\0\0'). This is all harmless, but should be fixed regardless.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-05-08 13:03:20 +01:00
parent e1c32120ce
commit ae6a89884a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/virshtest.c
View File

@ -151,9 +151,9 @@ testPipeFeeder(void *opaque)
}
memset(doc, ' ', emptyspace);
virStrcpy(doc + emptyspace, xml, xmlsize);
g_assert(virStrcpy(doc + emptyspace, xml, xmlsize + 1) == 0);
if (safewrite(fd, doc, emptyspace + xmlsize + 1) < 0) {
if (safewrite(fd, doc, emptyspace + xmlsize) < 0) {
fprintf(stderr, "\nfailed to write to pipe '%s': %s\n", pipepath, g_strerror(errno));
return;
}