ram: fixed int overflow on pagetok macro

[slstatus.git] / util.c

diff --git a/util.c b/util.c
index fc8b72a..5ce2396 100644 (file)
--- a/util.c
+++ b/util.c
@@ -48,27 +48,37 @@ die(const char *fmt, ...)
        exit(1);
 }
 
        exit(1);
 }
 

-int
-esnprintf(char *str, size_t size, const char *fmt, ...)
+static int
+evsnprintf(char *str, size_t size, const char *fmt, va_list ap)

 {
 {

-       va_list ap;

        int ret;
 
        int ret;
 

-       va_start(ap, fmt);

        ret = vsnprintf(str, size, fmt, ap);
        ret = vsnprintf(str, size, fmt, ap);

-       va_end(ap);

 
        if (ret < 0) {
 
        if (ret < 0) {

-               warn("snprintf:");
+               warn("vsnprintf:");

                return -1;
        } else if ((size_t)ret >= size) {
                return -1;
        } else if ((size_t)ret >= size) {

-               warn("snprintf: Output truncated");
+               warn("vsnprintf: Output truncated");

                return -1;
        }
 
        return ret;
 }
 
                return -1;
        }
 
        return ret;
 }
 

+int
+esnprintf(char *str, size_t size, const char *fmt, ...)
+{
+       va_list ap;
+       int ret;
+
+       va_start(ap, fmt);
+       ret = evsnprintf(str, size, fmt, ap);
+       va_end(ap);
+
+       return ret;
+}
+

 const char *
 bprintf(const char *fmt, ...)
 {
 const char *
 bprintf(const char *fmt, ...)
 {


@@ -76,34 +86,38 @@ bprintf(const char *fmt, ...)
        int ret;
 
        va_start(ap, fmt);
        int ret;
 
        va_start(ap, fmt);

-       if ((ret = vsnprintf(buf, sizeof(buf), fmt, ap)) < 0) {
-               warn("vsnprintf:");
-       } else if ((size_t)ret >= sizeof(buf)) {
-               warn("vsnprintf: Output truncated");
-       }
+       ret = evsnprintf(buf, sizeof(buf), fmt, ap);

        va_end(ap);
 
        va_end(ap);
 

-       return buf;
+       return (ret < 0) ? NULL : buf;

 }
 
 const char *
 fmt_human(size_t num, int base)
 {
 }
 
 const char *
 fmt_human(size_t num, int base)
 {

-       size_t i;

        double scaled;
        double scaled;

-       const char *siprefix[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
-       const char *iecprefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
-                                   "Zi", "Yi" };
-       char *prefix[9];
-
-       if (base == 1000) {
-               memcpy(prefix, siprefix, sizeof(prefix));
-       } else if (base == 1024) {
-               memcpy(prefix, iecprefix, sizeof(prefix));
+       size_t i, prefixlen;
+       const char **prefix;
+       const char *prefix_1000[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
+       const char *prefix_1024[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
+                                     "Zi", "Yi" };
+
+       switch (base) {
+       case 1000:
+               prefix = prefix_1000;
+               prefixlen = LEN(prefix_1000);
+               break;
+       case 1024:
+               prefix = prefix_1024;
+               prefixlen = LEN(prefix_1024);
+               break;
+       default:
+               warn("fmt_human: Invalid base");
+               return NULL;

        }
 
        scaled = num;
        }
 
        scaled = num;

-       for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) {
+       for (i = 0; i < prefixlen && scaled >= base; i++) {

                scaled /= base;
        }
 
                scaled /= base;
        }