Fixes, cleanups and qcow2+luks support (blockdev-add saga)

[libvirt] [PATCH 01/14] tests: utils: Tolerate NULL actual data in virTestCompareToFile

Posted by Peter Krempa 7 years, 1 month ago

The function docs state that 'strcontent' may be NULL, but code added in
3506f1ecfde did not use the 'cmpcontent' variable which was fixed and
dereferenced it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/testutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/testutils.c b/tests/testutils.c
index 040ef1d2f7..4bd1b63755 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -800,8 +800,8 @@ virTestCompareToFile(const char *strcontent,

         if (filecontentLen > 0 &&
             filecontent[filecontentLen - 1] == '\n' &&
-            strcontent[strlen(strcontent) - 1] != '\n') {
-            if (virAsprintf(&fixedcontent, "%s\n", strcontent) < 0)
+            cmpcontent[strlen(cmpcontent) - 1] != '\n') {
+            if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0)
                 goto failure;
             cmpcontent = fixedcontent;
         }
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 01/14] tests: utils: Tolerate NULL actual data in virTestCompareToFile

Posted by Ján Tomko 7 years, 1 month ago

On Thu, Mar 29, 2018 at 01:50:58PM +0200, Peter Krempa wrote:
>The function docs state that 'strcontent' may be NULL, but code added in
>3506f1ecfde did not use the 'cmpcontent' variable which was fixed and
>dereferenced it.

easier to follow as:

3506f1ecfde dereferenced it instead of using the fixed 'cmpcontent'
variable.

>
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> tests/testutils.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/tests/testutils.c b/tests/testutils.c
>index 040ef1d2f7..4bd1b63755 100644
>--- a/tests/testutils.c
>+++ b/tests/testutils.c
>@@ -800,8 +800,8 @@ virTestCompareToFile(const char *strcontent,
>
>         if (filecontentLen > 0 &&
>             filecontent[filecontentLen - 1] == '\n' &&
>-            strcontent[strlen(strcontent) - 1] != '\n') {
>-            if (virAsprintf(&fixedcontent, "%s\n", strcontent) < 0)
>+            cmpcontent[strlen(cmpcontent) - 1] != '\n') {
>+            if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0)

ACK if you check if strlen(cmpcontent) > 0 as well.

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list