Document XCode 3.2 import.

[secnet] / util.c

diff --git a/util.c b/util.c
index 9a009dca911d79f1feafe5c2f4c8c144bb3e667c..fff5b6d13e5e0f74544723ea4ff9e8f9013634f5 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)


@@ -133,7 +139,7 @@ static uint8_t hexval(uint8_t c)
 }
 
 /* Convert a MP_INT into a buffer; return length; truncate if necessary */
 }
 
 /* Convert a MP_INT into a buffer; return length; truncate if necessary */

-uint32_t write_mpbin(MP_INT *a, uint8_t *buffer, uint32_t buflen)
+int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen)

 {
     char *hb;
     int i,j,l;
 {
     char *hb;
     int i,j,l;


@@ -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);
 }
 


@@ -213,7 +224,7 @@ struct buffer {
 };
 
 void buffer_assert_free(struct buffer_if *buffer, cstring_t file,
 };
 
 void buffer_assert_free(struct buffer_if *buffer, cstring_t file,

-                       uint32_t line)
+                       int line)

 {
     if (!buffer->free) {
        fatal("BUF_ASSERT_FREE, %s line %d, owned by %s",
 {
     if (!buffer->free) {
        fatal("BUF_ASSERT_FREE, %s line %d, owned by %s",


@@ -222,7 +233,7 @@ void buffer_assert_free(struct buffer_if *buffer, cstring_t file,
 }
 
 void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
 }
 
 void buffer_assert_used(struct buffer_if *buffer, cstring_t file,

-                       uint32_t line)
+                       int line)

 {
     if (buffer->free) {
        fatal("BUF_ASSERT_USED, %s line %d, last owned by %s",
 {
     if (buffer->free) {
        fatal("BUF_ASSERT_USED, %s line %d, last owned by %s",


@@ -230,30 +241,32 @@ void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
     }
 }
 
     }
 }
 

-void buffer_init(struct buffer_if *buffer, uint32_t max_start_pad)
+void buffer_init(struct buffer_if *buffer, int32_t max_start_pad)

 {
     buffer->start=buffer->base+max_start_pad;
     buffer->size=0;
 }
 
 {
     buffer->start=buffer->base+max_start_pad;
     buffer->size=0;
 }
 

-void *buf_append(struct buffer_if *buf, uint32_t amount) {
+void *buf_append(struct buffer_if *buf, int32_t amount) {

     void *p;
     void *p;

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

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

-void *buf_prepend(struct buffer_if *buf, uint32_t amount) {
+void *buf_prepend(struct buffer_if *buf, int32_t amount) {
+    assert(amount <= buf->start - buf->base);

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

-void *buf_unappend(struct buffer_if *buf, uint32_t amount) {
+void *buf_unappend(struct buffer_if *buf, int32_t amount) {

     if (buf->size < amount) return 0;
     return buf->start+(buf->size-=amount);
 }
 
     if (buf->size < amount) return 0;
     return buf->start+(buf->size-=amount);
 }
 

-void *buf_unprepend(struct buffer_if *buf, uint32_t amount) {
+void *buf_unprepend(struct buffer_if *buf, int32_t amount) {

     void *p;
     p=buf->start;
     buf->start+=amount;
     void *p;
     p=buf->start;
     buf->start+=amount;


@@ -265,14 +278,15 @@ void *buf_unprepend(struct buffer_if *buf, uint32_t amount) {
    network byte order. */
 void buf_append_string(struct buffer_if *buf, cstring_t s)
 {
    network byte order. */
 void buf_append_string(struct buffer_if *buf, cstring_t s)
 {

-    uint16_t len;
+    size_t len;

 
     len=strlen(s);
 
     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);
 }
 

-void buffer_new(struct buffer_if *buf, uint32_t len)
+void buffer_new(struct buffer_if *buf, int32_t len)

 {
     buf->free=True;
     buf->owner=NULL;
 {
     buf->free=True;
     buf->owner=NULL;