From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Apr 2018 14:16:52 +0000 (+0200)
Subject: tests: utils: Fix out-of-bounds access to memory in virTestCompareToFile
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9c75425aa263abe248ab6c4895b57b9dae2a53ae;p=libvirt.git

tests: utils: Fix out-of-bounds access to memory in virTestCompareToFile

Similarly to 3506f1ecfde, the contents of 'cmpcontent' may be an empty
string so the following code would access memory out of the array.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/tests/testutils.c b/tests/testutils.c
index 4bd1b63755..7c095caac9 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -797,10 +797,11 @@ virTestCompareToFile(const char *strcontent,
 
     if (filecontent) {
         size_t filecontentLen = strlen(filecontent);
+        size_t cmpcontentLen = strlen(cmpcontent);
 
         if (filecontentLen > 0 &&
             filecontent[filecontentLen - 1] == '\n' &&
-            cmpcontent[strlen(cmpcontent) - 1] != '\n') {
+            (cmpcontentLen == 0 || cmpcontent[cmpcontentLen - 1] != '\n')) {
             if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0)
                 goto failure;
             cmpcontent = fixedcontent;