virBufferAdd: Ensure that the buffer is initialized also when len == 0

There's an optimization in virBufferAdd which returns early when the
length of the added string is 0 (given that auto-indent is disabled).

The optimization causes inconsistent behaviour between these two cases:

 virBufferAdd(buf, "", 0);  // this doesn't initialize the buffer

and

 virBufferAdd(buf, "", -1); //this initializes the buffer

Since using an empty string is used to prime the buffer to an empty
string it can be confusing. Remove the optimization.

This fixes such a wrong initialization done in x86FeatureNames.

Note that our code in many places expects that if no virBuffer APIs are
used on a buffer object, then NULL should be retured, so we can't always
prime the buffer to an empty string.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index ebb4108b5d6a23c80b901222e54bb8a1ab7b3657..b9ddf1f5c98994746ae728e329a492cf1f53f954 100644 (file)
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -156,7 +156,7 @@ virBufferApplyIndent(virBufferPtr buf)
 void
 virBufferAdd(virBufferPtr buf, const char *str, int len)
 {
-    if (!str || !buf || (len == 0 && buf->indent == 0))
+    if (!str || !buf)
         return;
 
     virBufferInitialize(buf);