Suppress hardcoded table sizes

. Use sizeof() instead of hardcoded values
. snprintf(..., size, ""...) is in error if the return code is >= size (not sufficient to set only ">")

Signed-off-by: Rachid Koucha <rachid.koucha@gmail.com>

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 6d8a65818a35d5fa3f08b37472352f36163bdf5a..bf4a9c2cbda4ea3a71e59685b1322bfce1bf5de2 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1171,8 +1171,8 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
                if (srcfd < 0)
                        return srcfd;
 
-               ret = snprintf(srcbuf, 50, "/proc/self/fd/%d", srcfd);
-               if (ret < 0 || ret > 50) {
+               ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
+               if (ret < 0 || ret >= (int)sizeof(srcbuf)) {
                        close(srcfd);
                        ERROR("Out of memory");
                        return -EINVAL;
@@ -1191,8 +1191,8 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
                return destfd;
        }
 
-       ret = snprintf(destbuf, 50, "/proc/self/fd/%d", destfd);
-       if (ret < 0 || ret > 50) {
+       ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
+       if (ret < 0 || ret >= (int)sizeof(destbuf)) {
                if (srcfd != -1)
                        close(srcfd);