diff options
Diffstat (limited to 'src/lib/libcrypto/stack/stack.c')
-rw-r--r-- | src/lib/libcrypto/stack/stack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c index 76cf1a1168..dabf26d2cd 100644 --- a/src/lib/libcrypto/stack/stack.c +++ b/src/lib/libcrypto/stack/stack.c | |||
@@ -95,7 +95,7 @@ _STACK *sk_dup(_STACK *sk) | |||
95 | char **s; | 95 | char **s; |
96 | 96 | ||
97 | if ((ret=sk_new(sk->comp)) == NULL) goto err; | 97 | if ((ret=sk_new(sk->comp)) == NULL) goto err; |
98 | s=(char **)OPENSSL_realloc((char *)ret->data, | 98 | s=(char **)realloc((char *)ret->data, |
99 | (unsigned int)sizeof(char *)*sk->num_alloc); | 99 | (unsigned int)sizeof(char *)*sk->num_alloc); |
100 | if (s == NULL) goto err; | 100 | if (s == NULL) goto err; |
101 | ret->data=s; | 101 | ret->data=s; |
@@ -122,9 +122,9 @@ _STACK *sk_new(int (*c)(const void *, const void *)) | |||
122 | _STACK *ret; | 122 | _STACK *ret; |
123 | int i; | 123 | int i; |
124 | 124 | ||
125 | if ((ret=OPENSSL_malloc(sizeof(_STACK))) == NULL) | 125 | if ((ret=malloc(sizeof(_STACK))) == NULL) |
126 | goto err; | 126 | goto err; |
127 | if ((ret->data=OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL) | 127 | if ((ret->data=malloc(sizeof(char *)*MIN_NODES)) == NULL) |
128 | goto err; | 128 | goto err; |
129 | for (i=0; i<MIN_NODES; i++) | 129 | for (i=0; i<MIN_NODES; i++) |
130 | ret->data[i]=NULL; | 130 | ret->data[i]=NULL; |
@@ -135,7 +135,7 @@ _STACK *sk_new(int (*c)(const void *, const void *)) | |||
135 | return(ret); | 135 | return(ret); |
136 | err: | 136 | err: |
137 | if(ret) | 137 | if(ret) |
138 | OPENSSL_free(ret); | 138 | free(ret); |
139 | return(NULL); | 139 | return(NULL); |
140 | } | 140 | } |
141 | 141 | ||
@@ -146,7 +146,7 @@ int sk_insert(_STACK *st, void *data, int loc) | |||
146 | if(st == NULL) return 0; | 146 | if(st == NULL) return 0; |
147 | if (st->num_alloc <= st->num+1) | 147 | if (st->num_alloc <= st->num+1) |
148 | { | 148 | { |
149 | s=OPENSSL_realloc((char *)st->data, | 149 | s=realloc((char *)st->data, |
150 | (unsigned int)sizeof(char *)*st->num_alloc*2); | 150 | (unsigned int)sizeof(char *)*st->num_alloc*2); |
151 | if (s == NULL) | 151 | if (s == NULL) |
152 | return(0); | 152 | return(0); |
@@ -287,8 +287,8 @@ void sk_pop_free(_STACK *st, void (*func)(void *)) | |||
287 | void sk_free(_STACK *st) | 287 | void sk_free(_STACK *st) |
288 | { | 288 | { |
289 | if (st == NULL) return; | 289 | if (st == NULL) return; |
290 | if (st->data != NULL) OPENSSL_free(st->data); | 290 | if (st->data != NULL) free(st->data); |
291 | OPENSSL_free(st); | 291 | free(st); |
292 | } | 292 | } |
293 | 293 | ||
294 | int sk_num(const _STACK *st) | 294 | int sk_num(const _STACK *st) |