Avoid warning about empty structures and always define CHECKED_PTR_OF

[openssl.git] / crypto / stack / stack.c

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 3e2f4d8786329f996bac473ad35620368a07980a..378bd7c7968c432dd609f207d0cb646b293dca1d 100644 (file)
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -68,17 +68,19 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/stack.h>
+#include <openssl/objects.h>
 
 #undef MIN_NODES
 #define MIN_NODES      4
 
-const char *STACK_version="Stack" OPENSSL_VERSION_PTEXT;
+const char STACK_version[]="Stack" OPENSSL_VERSION_PTEXT;
 
 #include <errno.h>
 
-int (*sk_set_cmp_func(STACK *sk, int (*c)(const void *,const void *)))(const void *, const void *)
+int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *,const char * const *)))
+               (const char * const *, const char * const *)
        {
-       int (*old)(const void *,const void *)=sk->comp;
+       int (*old)(const char * const *,const char * const *)=sk->comp;
 
        if (sk->comp != c)
                sk->sorted=0;
@@ -93,7 +95,7 @@ STACK *sk_dup(STACK *sk)
        char **s;
 
        if ((ret=sk_new(sk->comp)) == NULL) goto err;
-       s=(char **)Realloc((char *)ret->data,
+       s=(char **)OPENSSL_realloc((char *)ret->data,
                (unsigned int)sizeof(char *)*sk->num_alloc);
        if (s == NULL) goto err;
        ret->data=s;
@@ -105,18 +107,25 @@ STACK *sk_dup(STACK *sk)
        ret->comp=sk->comp;
        return(ret);
 err:
+       if(ret)
+               sk_free(ret);
        return(NULL);
        }
 
-STACK *sk_new(int (*c)(const void *, const void *))
+STACK *sk_new_null(void)
+       {
+       return sk_new((int (*)(const char * const *, const char * const *))0);
+       }
+
+STACK *sk_new(int (*c)(const char * const *, const char * const *))
        {
        STACK *ret;
        int i;
 
-       if ((ret=(STACK *)Malloc(sizeof(STACK))) == NULL)
-               goto err0;
-       if ((ret->data=(char **)Malloc(sizeof(char *)*MIN_NODES)) == NULL)
-               goto err1;
+       if ((ret=(STACK *)OPENSSL_malloc(sizeof(STACK))) == NULL)
+               goto err;
+       if ((ret->data=(char **)OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL)
+               goto err;
        for (i=0; i<MIN_NODES; i++)
                ret->data[i]=NULL;
        ret->comp=c;
@@ -124,9 +133,9 @@ STACK *sk_new(int (*c)(const void *, const void *))
        ret->num=0;
        ret->sorted=0;
        return(ret);
-err1:
-       Free(ret);
-err0:
+err:
+       if(ret)
+               OPENSSL_free(ret);
        return(NULL);
        }
 
@@ -137,7 +146,7 @@ int sk_insert(STACK *st, char *data, int loc)
        if(st == NULL) return 0;
        if (st->num_alloc <= st->num+1)
                {
-               s=(char **)Realloc((char *)st->data,
+               s=(char **)OPENSSL_realloc((char *)st->data,
                        (unsigned int)sizeof(char *)*st->num_alloc*2);
                if (s == NULL)
                        return(0);
@@ -183,8 +192,7 @@ char *sk_delete(STACK *st, int loc)
        char *ret;
        int i,j;
 
-       if ((st == NULL) || (st->num == 0) || (loc < 0)
-                                        || (loc >= st->num)) return(NULL);
+       if(!st || (loc < 0) || (loc >= st->num)) return NULL;
 
        ret=st->data[loc];
        if (loc != st->num-1)
@@ -202,7 +210,7 @@ char *sk_delete(STACK *st, int loc)
        return(ret);
        }
 
-int sk_find(STACK *st, char *data)
+static int internal_find(STACK *st, char *data, int ret_val_options)
        {
        char **r;
        int i;
@@ -218,15 +226,26 @@ int sk_find(STACK *st, char *data)
                }
        sk_sort(st);
        if (data == NULL) return(-1);
-       comp_func=st->comp;
-       r=(char **)bsearch(&data,(char *)st->data,
-               st->num,sizeof(char *), comp_func);
+       /* This (and the "qsort" below) are the two places in OpenSSL
+        * where we need to convert from our standard (type **,type **)
+        * compare callback type to the (void *,void *) type required by
+        * bsearch. However, the "data" it is being called(back) with are
+        * not (type *) pointers, but the *pointers* to (type *) pointers,
+        * so we get our extra level of pointer dereferencing that way. */
+       comp_func=(int (*)(const void *,const void *))(st->comp);
+       r=(char **)OBJ_bsearch_ex((char *)&data,(char *)st->data,
+               st->num,sizeof(char *),comp_func,ret_val_options);
        if (r == NULL) return(-1);
-       i=(int)(r-st->data);
-       for ( ; i>0; i--)
-               if ((*st->comp)(&(st->data[i-1]),&data) < 0)
-                       break;
-       return(i);
+       return((int)(r-st->data));
+       }
+
+int sk_find(STACK *st, char *data)
+       {
+       return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
+       }
+int sk_find_ex(STACK *st, char *data)
+       {
+       return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH);
        }
 
 int sk_push(STACK *st, char *data)
@@ -275,36 +294,48 @@ void sk_pop_free(STACK *st, void (*func)(void *))
 void sk_free(STACK *st)
        {
        if (st == NULL) return;
-       if (st->data != NULL) Free(st->data);
-       Free(st);
+       if (st->data != NULL) OPENSSL_free(st->data);
+       OPENSSL_free(st);
        }
 
-int sk_num(STACK *st)
+int sk_num(const STACK *st)
 {
        if(st == NULL) return -1;
        return st->num;
 }
 
-char *sk_value(STACK *st, int i)
+char *sk_value(const STACK *st, int i)
 {
-       if(st == NULL) return NULL;
+       if(!st || (i < 0) || (i >= st->num)) return NULL;
        return st->data[i];
 }
 
 char *sk_set(STACK *st, int i, char *value)
 {
-       if(st == NULL) return NULL;
+       if(!st || (i < 0) || (i >= st->num)) return NULL;
        return (st->data[i] = value);
 }
 
 void sk_sort(STACK *st)
-    {
-    if (!st->sorted)
        {
-       int (*comp_func)(const void *,const void *);
+       if (st && !st->sorted)
+               {
+               int (*comp_func)(const void *,const void *);
+
+               /* same comment as in sk_find ... previously st->comp was declared
+                * as a (void*,void*) callback type, but this made the population
+                * of the callback pointer illogical - our callbacks compare
+                * type** with type**, so we leave the casting until absolutely
+                * necessary (ie. "now"). */
+               comp_func=(int (*)(const void *,const void *))(st->comp);
+               qsort(st->data,st->num,sizeof(char *), comp_func);
+               st->sorted=1;
+               }
+       }
 
-       comp_func=st->comp;
-       qsort(st->data,st->num,sizeof(char *), comp_func);
-       st->sorted=1;
+int sk_is_sorted(const STACK *st)
+       {
+       if (!st)
+               return 1;
+       return st->sorted;
        }
-    }