From: VMware, Inc <>
Date: Thu, 27 Oct 2011 18:27:19 +0000 (-0700)
Subject: Fix crash in vmbackup's abort timer.
X-Git-Tag: 2011.10.26-514583~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=532e29d23f16c145c493685fc784d44cabc1febd;p=thirdparty%2Fopen-vm-tools.git

Fix crash in vmbackup's abort timer.

VmBackupDoAbort cleans up the global backup state, so we shouldn't access
its fields after calling that function.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index d3ab6a28e..c8b8e6c7c 100644
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -358,9 +358,9 @@ VmBackupAbortTimer(gpointer data)
 {
    ASSERT(gBackupState != NULL);
    g_warning("Aborting backup operation due to timeout.");
-   VmBackupDoAbort();
    g_source_unref(gBackupState->abortTimer);
    gBackupState->abortTimer = NULL;
+   VmBackupDoAbort();
    return FALSE;
 }