mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
92b252456e
g_regex_unref reports an error if called with a NULL argument.
We have two cases in the code where we (possibly) call it on a NULL
argument. The interesting one is in virDomainQemuMonitorEventCleanup.
Based on VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX, we unref
data->regex, which has two problems:
* On the client side, flags is -1 so the comparison is true even if no
regex was used, reproducible by:
$ virsh qemu-monitor-event --timeout 1
which results in an ugly error:
(process:1289846): GLib-CRITICAL **: 14:58:42.631: g_regex_unref: assertion 'regex != NULL' failed
* On the server side, we only create the regex if both the flag and the
string are present, so it's possible to trigger this message by:
$ virsh qemu-monitor-event --regex --timeout 1
Use a non-NULL comparison instead of the flag to decide whether we need
to unref the regex. And add a non-NULL check to the unref in the
VirtualBox test too.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Fixes: 71efb59a4d
https://bugzilla.redhat.com/show_bug.cgi?id=1876907
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
153 lines
3.4 KiB
C
153 lines
3.4 KiB
C
#include <config.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include "testutils.h"
|
|
|
|
#ifdef WITH_VBOX
|
|
|
|
# include "vbox/vbox_snapshot_conf.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
static const char *testSnapshotXMLVariableLineRegexStr =
|
|
"lastStateChange=[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z";
|
|
|
|
GRegex *testSnapshotXMLVariableLineRegex = NULL;
|
|
|
|
static char *
|
|
testFilterXML(char *xml)
|
|
{
|
|
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
|
char **xmlLines = NULL;
|
|
char **xmlLine;
|
|
char *ret = NULL;
|
|
|
|
if (!(xmlLines = virStringSplit(xml, "\n", 0))) {
|
|
VIR_FREE(xml);
|
|
goto cleanup;
|
|
}
|
|
VIR_FREE(xml);
|
|
|
|
for (xmlLine = xmlLines; *xmlLine; xmlLine++) {
|
|
if (g_regex_match(testSnapshotXMLVariableLineRegex, *xmlLine, 0, NULL))
|
|
continue;
|
|
|
|
virBufferStrcat(&buf, *xmlLine, "\n", NULL);
|
|
}
|
|
|
|
ret = virBufferContentAndReset(&buf);
|
|
|
|
cleanup:
|
|
g_strfreev(xmlLines);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
testCompareXMLtoXMLFiles(const char *xml)
|
|
{
|
|
char *xmlData = NULL;
|
|
char *actual = NULL;
|
|
char *pathResult = NULL;
|
|
int ret = -1;
|
|
virVBoxSnapshotConfMachinePtr machine = NULL;
|
|
|
|
pathResult = g_strdup(abs_builddir "/vboxsnapshotxmldata/testResult.vbox");
|
|
|
|
if (virFileMakePath(abs_builddir "/vboxsnapshotxmldata") < 0)
|
|
goto cleanup;
|
|
|
|
if (virTestLoadFile(xml, &xmlData) < 0)
|
|
goto cleanup;
|
|
|
|
if (!(machine = virVBoxSnapshotConfLoadVboxFile(xml, (char*)"")))
|
|
goto cleanup;
|
|
|
|
if (virVBoxSnapshotConfSaveVboxFile(machine, pathResult) < 0)
|
|
goto cleanup;
|
|
|
|
if (virTestLoadFile(pathResult, &actual) < 0)
|
|
goto cleanup;
|
|
|
|
if (!(actual = testFilterXML(actual)))
|
|
goto cleanup;
|
|
if (!(xmlData = testFilterXML(xmlData)))
|
|
goto cleanup;
|
|
|
|
if (STRNEQ(actual, xmlData)) {
|
|
virTestDifference(stderr, xmlData, actual);
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
unlink(pathResult);
|
|
rmdir(abs_builddir "/vboxsnapshotxmldata");
|
|
VIR_FREE(xmlData);
|
|
VIR_FREE(actual);
|
|
virVBoxSnapshotConfMachineFree(machine);
|
|
VIR_FREE(pathResult);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
testCompareXMLToXMLHelper(const void *data)
|
|
{
|
|
int result = -1;
|
|
char *xml = NULL;
|
|
|
|
xml = g_strdup_printf("%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir,
|
|
(const char *)data);
|
|
|
|
result = testCompareXMLtoXMLFiles(xml);
|
|
|
|
VIR_FREE(xml);
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
g_autoptr(GError) err = NULL;
|
|
|
|
testSnapshotXMLVariableLineRegex = g_regex_new(testSnapshotXMLVariableLineRegexStr,
|
|
0, 0, &err);
|
|
|
|
if (!testSnapshotXMLVariableLineRegex) {
|
|
ret = -1;
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
"failed to compile test regex");
|
|
goto cleanup;
|
|
}
|
|
|
|
# define DO_TEST(name) \
|
|
if (virTestRun("VBox Snapshot XML-2-XML " name, \
|
|
testCompareXMLToXMLHelper, (name)) < 0) \
|
|
ret = -1
|
|
|
|
DO_TEST("2disks-nosnap");
|
|
DO_TEST("2disks-1snap");
|
|
DO_TEST("2disks-2snap");
|
|
DO_TEST("2disks-3snap");
|
|
DO_TEST("2disks-3snap-brother");
|
|
|
|
cleanup:
|
|
if (testSnapshotXMLVariableLineRegex)
|
|
g_regex_unref(testSnapshotXMLVariableLineRegex);
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIR_TEST_MAIN(mymain)
|
|
|
|
#else
|
|
|
|
int main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#endif /* WITH_VBOX */
|