From: John Ferlan <jferlan@redhat.com>
Date: Thu, 20 Sep 2018 21:34:38 +0000 (-0400)
Subject: tests: Resolve possible overrun
X-Git-Tag: v4.8.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eb56dcd9ef4c21f8f4bc5e639dc4dd01e6d572a;p=thirdparty%2Flibvirt.git

tests: Resolve possible overrun

Coverity noted that each of the fmemopen called used the strlen value
in order to allocate space, but that neglected space for terminating
null string. So just add 1 to the strlen.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index d512417789..6587fb3c7e 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -466,12 +466,13 @@ FILE *fopen(const char *path, const char *mode)
         if (STREQ(mode, "r")) {
             if (allinone)
                 return fmemopen((void *)procmountsallinone,
-                                strlen(procmountsallinone), mode);
+                                strlen(procmountsallinone) + 1, mode);
             else if (logind)
                 return fmemopen((void *)procmountslogind,
-                                strlen(procmountslogind), mode);
+                                strlen(procmountslogind) + 1, mode);
             else
-                return fmemopen((void *)procmounts, strlen(procmounts), mode);
+                return fmemopen((void *)procmounts,
+                                strlen(procmounts) + 1, mode);
         } else {
             errno = EACCES;
             return NULL;
@@ -481,12 +482,13 @@ FILE *fopen(const char *path, const char *mode)
         if (STREQ(mode, "r")) {
             if (allinone)
                 return fmemopen((void *)proccgroupsallinone,
-                                strlen(proccgroupsallinone), mode);
+                                strlen(proccgroupsallinone) + 1, mode);
             else if (logind)
                 return fmemopen((void *)proccgroupslogind,
-                                strlen(proccgroupslogind), mode);
+                                strlen(proccgroupslogind) + 1, mode);
             else
-                return fmemopen((void *)proccgroups, strlen(proccgroups), mode);
+                return fmemopen((void *)proccgroups,
+                                strlen(proccgroups) + 1, mode);
         } else {
             errno = EACCES;
             return NULL;
@@ -496,12 +498,13 @@ FILE *fopen(const char *path, const char *mode)
         if (STREQ(mode, "r")) {
             if (allinone)
                 return fmemopen((void *)procselfcgroupsallinone,
-                                strlen(procselfcgroupsallinone), mode);
+                                strlen(procselfcgroupsallinone) + 1, mode);
             else if (logind)
                 return fmemopen((void *)procselfcgroupslogind,
-                                strlen(procselfcgroupslogind), mode);
+                                strlen(procselfcgroupslogind) + 1, mode);
             else
-                return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode);
+                return fmemopen((void *)procselfcgroups,
+                                strlen(procselfcgroups) + 1, mode);
         } else {
             errno = EACCES;
             return NULL;