Changeset 124a071 in code

Timestamp:

Aug 30, 2017, 12:11:44 AM (8 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

614260f

Parents:

d8c3967

Message:

Use the same pattern when creating Status and Error messages

File:

• icb.c (modified) (4 diffs)

icb.c

@@ -401 +401 @@
         va_list ap;
         char buf[ICB_MSGSIZE];
-        int res, buflen = 1;
+        int res, buflen;
         static const struct {
                 int              type;
@@ -429 +429 @@
                 return;
         }
-        buflen += MIN((size_t)res, sizeof buf - 1);
-        if ((size_t)buflen >= sizeof buf) {
+        if ((size_t)res >= sizeof buf) {
                 icbd_log(NULL, LOG_ERR, "Status buffer too small");
                 return;
         }
+        buflen = MIN((size_t)res + 1, sizeof buf - 1);
         va_start(ap, fmt);
-        res = vsnprintf(&buf[buflen], sizeof buf - buflen, fmt, ap);
+        res = vsnprintf(&buf[buflen], sizeof buf - buflen - 1, fmt, ap);
         va_end(ap);
+        buflen--; /* buf[buflen] was overwritten */
         if (res < 0) {
-                icbd_log(NULL, LOG_ERR, "Format error in %s", __func__);
-                return;
-        }
-        buflen += MIN((size_t)res, sizeof buf - buflen);
+                icbd_log(NULL, LOG_ERR, "Message format error in %s", __func__);
+                return;
+        }
+        if ((size_t)res + buflen >= sizeof buf) {
+                icbd_log(NULL, LOG_ERR, "Status message too long");
+                return;
+        }
+        buflen += MIN((size_t)res + 1, sizeof buf - buflen - 1);
         buf[0] = buflen;
         icbd_send(is, buf, buflen + 1);
@@ -478 +483 @@
         char buf[ICB_MSGSIZE];
         va_list ap;
-        int res, buflen = 1;
+        int res, buflen;
 
         va_start(ap, fmt);
@@ -487 +492 @@
                 return;
         }
-        buflen += MIN((size_t)res, sizeof buf - 2);
+        buflen = MIN((size_t)res + 1, sizeof buf - 2);
         buf[0] = ++buflen; /* account for ICB_M_ERROR */
         buf[1] = ICB_M_ERROR;