integer arithmetic types: correct perhaps-possible negative timeout situation

[secnet.git] / util.c

diff --git a/util.c b/util.c
index d2a3e98b76e7692e948a08c9bd3598823ec35ffe..44a45e50d4c22d0c19350e9277e91d93d4ed65c3 100644 (file)
--- a/util.c
+++ b/util.c
@@ -74,6 +74,12 @@ void *safe_malloc(size_t size, const char *message)
     }
     return r;
 }
     }
     return r;
 }

+void *safe_malloc_ary(size_t size, size_t count, const char *message) {
+    if (count >= INT_MAX/size) {
+       fatal("array allocation overflow: %s", message);
+    }
+    return safe_malloc(size*count, message);
+}

 
 /* Convert a buffer into its MP_INT representation */
 void read_mpbin(MP_INT *a, uint8_t *bin, int binsize)
 
 /* Convert a buffer into its MP_INT representation */
 void read_mpbin(MP_INT *a, uint8_t *bin, int binsize)


@@ -198,12 +204,17 @@ bool_t remove_hook(uint32_t phase, hook_fn *fn, void *state)
     return False;
 }
 
     return False;
 }
 

+void vslilog(struct log_if *lf, int priority, const char *message, va_list ap)
+{
+    lf->vlog(lf->st,priority,message,ap);
+}
+

 void slilog(struct log_if *lf, int priority, const char *message, ...)
 {
     va_list ap;
     
     va_start(ap,message);
 void slilog(struct log_if *lf, int priority, const char *message, ...)
 {
     va_list ap;
     
     va_start(ap,message);

-    lf->vlog(lf->st,priority,message,ap);
+    vslilog(lf,priority,message,ap);

     va_end(ap);
 }
 
     va_end(ap);
 }
 


@@ -238,12 +249,14 @@ void buffer_init(struct buffer_if *buffer, uint32_t max_start_pad)
 
 void *buf_append(struct buffer_if *buf, uint32_t amount) {
     void *p;
 
 void *buf_append(struct buffer_if *buf, uint32_t amount) {
     void *p;

+    assert(buf->size <= buf->len - amount);

     p=buf->start + buf->size;
     buf->size+=amount;
     return p;
 }
 
 void *buf_prepend(struct buffer_if *buf, uint32_t amount) {
     p=buf->start + buf->size;
     buf->size+=amount;
     return p;
 }
 
 void *buf_prepend(struct buffer_if *buf, uint32_t amount) {

+    assert(amount <= buf->start - buf->base);

     buf->size+=amount;
     return buf->start-=amount;
 }
     buf->size+=amount;
     return buf->start-=amount;
 }


@@ -268,6 +281,7 @@ void buf_append_string(struct buffer_if *buf, cstring_t s)
     uint16_t len;
 
     len=strlen(s);
     uint16_t len;
 
     len=strlen(s);

+    /* fixme: if string is longer than 65535, result is a corrupted packet */

     buf_append_uint16(buf,len);
     memcpy(buf_append(buf,len),s,len);
 }
     buf_append_uint16(buf,len);
     memcpy(buf_append(buf,len),s,len);
 }


@@ -335,7 +349,6 @@ static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
     return new_closure(&st->cl);
 }
 

-init_module util_module;

 void util_module(dict_t *dict)
 {
     add_closure(dict,"sysbuffer",buffer_apply);
 void util_module(dict_t *dict)
 {
     add_closure(dict,"sysbuffer",buffer_apply);