From ae891f956ed3d28740f310447c890299586325c4 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 14 Feb 2011 16:20:39 -0700 Subject: [PATCH] virDomainMemoryStats: avoid null dereference * src/libvirt.c (virDomainMemoryStats): Check domain before flags. --- src/libvirt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 479a9b5aa6..f65cc24f2c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4411,12 +4411,6 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u", stats, nr_stats); - if (flags != 0) { - virLibDomainError(VIR_ERR_INVALID_ARG, - _("flags must be zero")); - goto error; - } - virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { @@ -4424,6 +4418,12 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, virDispatchError(NULL); return -1; } + if (flags != 0) { + virLibDomainError(VIR_ERR_INVALID_ARG, + _("flags must be zero")); + goto error; + } + if (!stats || nr_stats == 0) return 0; -- 2.39.5