remove ZBUFFER constants and increase max buffer size of server links

[ngircd-alex.git] / src / ngircd / array.c

diff --git a/src/ngircd/array.c b/src/ngircd/array.c
index bc28d042fdd4e65d8aba29b5e1760a2f31137bbc..d26d5e39b15874e1eb147da24fd01954e5cdd1c4 100644 (file)
--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -12,7 +12,7 @@
 
 #include "array.h"
 
-static char UNUSED id[] = "$Id: array.c,v 1.12 2006/09/30 21:49:46 fw Exp $";
+static char UNUSED id[] = "$Id: array.c,v 1.14 2006/12/28 12:53:41 alex Exp $";
 
 #include <assert.h>
 
@@ -247,19 +247,21 @@ void *
 array_get(array * a, size_t membersize, size_t pos)
 {
        size_t totalsize;
+       size_t posplus1 = pos + 1;
 
        assert(membersize > 0);
        assert(a != NULL);
 
-       if (array_UNUSABLE(a))
+       if (!posplus1 || array_UNUSABLE(a))
                return NULL;
 
-       if (!safemult_sizet(pos, membersize, &totalsize))
+       if (!safemult_sizet(posplus1, membersize, &totalsize))
                return NULL;
 
        if (a->allocated < totalsize)
                return NULL;
 
+       totalsize = pos * membersize;
        return a->mem + totalsize;
 }
 
@@ -268,7 +270,7 @@ void
 array_free(array * a)
 {
        assert(a != NULL);
-#ifdef DEBUG
+#ifdef DEBUG_ARRAY
        Log(LOG_DEBUG,
            "array_free(): %u bytes free'd (%u bytes still used at time of free()).",
            a->allocated, a->used);