- adding builtin[alias]db.

[samba.git] / source / lib / membuffer.c

diff --git a/source/lib/membuffer.c b/source/lib/membuffer.c
index 85f63e8c06551220cde57e8dc8115d21945bc710..92bc2be439726bf9987ec66c8417e2787f83a9af 100644 (file)
--- a/source/lib/membuffer.c
+++ b/source/lib/membuffer.c
@@ -79,7 +79,7 @@ void mem_init(struct mem_buf *buf, int margin)
  dynamic indicates memory has been dynamically allocated.
  if mem_free is called, the memory will be freed.
  ********************************************************************/
-void mem_create(struct mem_buf *buf, char *data, int size, int margin, BOOL dynamic)
+void mem_create(struct mem_buf *buf, char *data, int offset, int size, int margin, BOOL dynamic)
 {
        buf->dynamic   = dynamic;
        buf->data      = data;
@@ -90,8 +90,8 @@ void mem_create(struct mem_buf *buf, char *data, int size, int margin, BOOL dyna
 
        buf->next      = NULL;
 
-       buf->offset.start = 0;
-       buf->offset.end   = size;
+       buf->offset.start = offset;
+       buf->offset.end   = offset + size;
 }
 
 /*******************************************************************
@@ -109,7 +109,7 @@ BOOL mem_alloc_data(struct mem_buf *buf, int size)
 
        buf->data = malloc(buf->data_size);
 
-       if (buf->data == NULL)
+       if (buf->data == NULL && size != 0)
        {
                DEBUG(3,("mem_alloc: could not malloc size %d\n",
                                          buf->data_size));
@@ -313,16 +313,19 @@ static BOOL mem_find(struct mem_buf **buf, uint32 offset)
 
        while (f != NULL && offset >= f->offset.end)
        {
-               f = f->next;
-
                DEBUG(200,("mem_find: next[%d..%d]\n",
-             f->offset.start, f->offset.end));
+                       f->offset.start, f->offset.end));
+
+               f = f->next;
        }
 
        (*buf) = f;
 
-       DEBUG(200,("mem_find: found data[%d..%d]\n",
-             (*buf)->offset.start,(*buf)->offset.end));
+       if (f != NULL)
+       {
+               DEBUG(200,("mem_find: found data[%d..%d]\n",
+                     (*buf)->offset.start,(*buf)->offset.end));
+       }
 
        return f != NULL;
 }