]> xenbits.xensource.com Git - libvirt.git/commitdiff
Avoid crash on OOM in virbuftest
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 25 Sep 2013 14:31:18 +0000 (15:31 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 25 Sep 2013 17:12:09 +0000 (18:12 +0100)
The virbuftest code did not check virBufferError before
accessing the buffer contents, resulting in a crash on
OOM conditions.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
tests/virbuftest.c

index febe6e456cca12c9aba93f4568b8aea2f447d4d6..a6dcae6f5276550afbc4e0b9b0c6cc76969b0d91 100644 (file)
@@ -108,6 +108,10 @@ static int testBufAutoIndent(const void *data ATTRIBUTE_UNUSED)
     }
     virBufferAdjustIndent(buf, 2);
     virBufferAddLit(buf, "1");
+    if (virBufferError(buf)) {
+        TEST_ERROR("Buffer had error");
+        return -1;
+    }
     if (STRNEQ(virBufferCurrentContent(buf), "  1")) {
         TEST_ERROR("Wrong content");
         ret = -1;
@@ -134,6 +138,11 @@ static int testBufAutoIndent(const void *data ATTRIBUTE_UNUSED)
     virBufferEscapeShell(buf, " 11");
     virBufferAddChar(buf, '\n');
 
+    if (virBufferError(buf)) {
+        TEST_ERROR("Buffer had error");
+        return -1;
+    }
+
     result = virBufferContentAndReset(buf);
     if (!result || STRNEQ(result, expected)) {
         virtTestDifference(stderr, expected, result);
@@ -166,6 +175,11 @@ static int testBufTrim(const void *data ATTRIBUTE_UNUSED)
     virBufferTrim(buf, "b,,", 1);
     virBufferTrim(buf, ",", -1);
 
+    if (virBufferError(buf)) {
+        TEST_ERROR("Buffer had error");
+        return -1;
+    }
+
     result = virBufferContentAndReset(buf);
     if (!result || STRNEQ(result, expected)) {
         virtTestDifference(stderr, expected, result);