summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2004-04-21 16:03:00 +0000
committerRichard Levitte <levitte@openssl.org>2004-04-21 16:03:00 +0000
commit15c6cbd464a35eb994e4c14346cd07265b9cb3d4 (patch)
tree5f4270a03fcbd2809ffe12cee77199b7fbacc2b6
parenta6b8e925bca78693f4de1cb200424a6fec5cf1e9 (diff)
Recent changes from 0.9.7-stable.
-rw-r--r--crypto/stack/stack.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index ff6d14a86c..a6ecbe4c68 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -191,8 +191,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)
@@ -312,7 +311,7 @@ char *sk_value(const STACK *st, int 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);
}