From: Dmitry Guryanov <dguryanov@parallels.com>
Date: Mon, 1 Dec 2014 15:39:00 +0000 (+0300)
Subject: parallels: fix getJobResultHelper
X-Git-Tag: CVE-2014-8131-1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b56c07a6a18595a5ecb7339cafc485b47bba71ac;p=thirdparty%2Flibvirt.git

parallels: fix getJobResultHelper

When PrlJob_GetRetCode sets second argument to
error value it means sdk function failed and we
must return error from getJobResultHelper.

Signed-off-by: Dmitry Guryanov <dguryanov@parallels.com>
---

diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 50ff6c3aac..d3a10ab103 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -161,6 +161,7 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result,
             logPrlErrorHelper(retCode, filename, funcname, linenr);
 
         PrlHandle_Free(err_handle);
+        ret = retCode;
     } else {
         ret = PrlJob_GetResult(job, result);
         if (PRL_FAILED(ret)) {
@@ -169,8 +170,9 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result,
             *result = NULL;
             goto cleanup;
         }
+
+        ret = PRL_ERR_SUCCESS;
     }
-    ret = PRL_ERR_SUCCESS;
 
  cleanup:
     PrlHandle_Free(job);