Changeset 28c4fd3 in code

Timestamp:

Mar 14, 2014, 8:40:28 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

ad8b08d

Parents:

de86230

git-author:

Mike Belopuhov <mike@…> (03/14/14 20:30:45)

git-committer:

Mike Belopuhov <mike@…> (03/14/14 20:40:28)

Message:

Florian has pointed out that logger code suffers from the same problem
as the main code. So first of all don't forget to subtract the amount
of what's already read from the total length; secondly correct the
condition to check partial read.

File:

• logger.c (modified) (3 diffs)

logger.c

@@ -183 +183 @@
                                 return;
                 }
+                if (e->length >= ICB_MSGSIZE) {
+                        syslog(LOG_ERR, "%s: message too big: %lu", __func__,
+                            e->length);
+                        exit(EX_DATAERR);
+                }
                 /* fetch the message */
                 res = bufferevent_read(bev, &buf[nread],
-                    MIN(e->length, ICB_MSGSIZE));
+                    e->length - (nread - sizeof *e));
                 nread += res;
 #ifdef DEBUG
@@ -195 +200 @@
                 }
 #endif
-                if (nread < e->length)
+                if (nread - sizeof *e < e->length)
                         return;
                 /* terminate the buffer */
@@ -304 +309 @@
         if (evtimer_add(&ev_tick, &tv) < 0) {
                 syslog(LOG_ERR, "%s: evtimer_add: %m", __func__);
-                exit (EX_UNAVAILABLE);
-        }
-}
+                exit(EX_UNAVAILABLE);
+        }
+}