projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow NULL for some _free routines.
[openssl.git]
/
crypto
/
bio
/
bss_acpt.c
diff --git
a/crypto/bio/bss_acpt.c
b/crypto/bio/bss_acpt.c
index ecb115762e86c12bd1cd49a916b3b8a7e077e167..64cc452891a57ff698f1ed1108d011847013f7bf 100644
(file)
--- a/
crypto/bio/bss_acpt.c
+++ b/
crypto/bio/bss_acpt.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-61,16
+61,16
@@
static const BIO_METHOD methods_acceptp = {
bread_conv,
acpt_read,
acpt_puts,
bread_conv,
acpt_read,
acpt_puts,
- NULL, /* connect_gets, */
+ NULL, /* connect_gets,
*/
acpt_ctrl,
acpt_new,
acpt_free,
acpt_ctrl,
acpt_new,
acpt_free,
- NULL,
+ NULL,
/* connect_callback_ctrl */
};
const BIO_METHOD *BIO_s_accept(void)
{
};
const BIO_METHOD *BIO_s_accept(void)
{
- return
(&methods_acceptp)
;
+ return
&methods_acceptp
;
}
static int acpt_new(BIO *bi)
}
static int acpt_new(BIO *bi)
@@
-81,7
+81,7
@@
static int acpt_new(BIO *bi)
bi->num = (int)INVALID_SOCKET;
bi->flags = 0;
if ((ba = BIO_ACCEPT_new()) == NULL)
bi->num = (int)INVALID_SOCKET;
bi->flags = 0;
if ((ba = BIO_ACCEPT_new()) == NULL)
- return
(0)
;
+ return
0
;
bi->ptr = (char *)ba;
ba->state = ACPT_S_BEFORE;
bi->shutdown = 1;
bi->ptr = (char *)ba;
ba->state = ACPT_S_BEFORE;
bi->shutdown = 1;
@@
-93,17
+93,16
@@
static BIO_ACCEPT *BIO_ACCEPT_new(void)
BIO_ACCEPT *ret;
if ((ret = OPENSSL_zalloc(sizeof(*ret))) == NULL)
BIO_ACCEPT *ret;
if ((ret = OPENSSL_zalloc(sizeof(*ret))) == NULL)
- return
(NULL)
;
+ return
NULL
;
ret->accept_family = BIO_FAMILY_IPANY;
ret->accept_sock = (int)INVALID_SOCKET;
ret->accept_family = BIO_FAMILY_IPANY;
ret->accept_sock = (int)INVALID_SOCKET;
- return
(ret)
;
+ return
ret
;
}
static void BIO_ACCEPT_free(BIO_ACCEPT *a)
{
if (a == NULL)
return;
}
static void BIO_ACCEPT_free(BIO_ACCEPT *a)
{
if (a == NULL)
return;
-
OPENSSL_free(a->param_addr);
OPENSSL_free(a->param_serv);
BIO_ADDRINFO_free(a->addr_first);
OPENSSL_free(a->param_addr);
OPENSSL_free(a->param_serv);
BIO_ADDRINFO_free(a->addr_first);
@@
-133,7
+132,7
@@
static int acpt_free(BIO *a)
BIO_ACCEPT *data;
if (a == NULL)
BIO_ACCEPT *data;
if (a == NULL)
- return
(0)
;
+ return
0
;
data = (BIO_ACCEPT *)a->ptr;
if (a->shutdown) {
data = (BIO_ACCEPT *)a->ptr;
if (a->shutdown) {
@@
-275,6
+274,11
@@
static int acpt_state(BIO *b, BIO_ACCEPT *c)
BIO_clear_retry_flags(b);
b->retry_reason = 0;
BIO_clear_retry_flags(b);
b->retry_reason = 0;
+ OPENSSL_free(c->cache_peer_name);
+ c->cache_peer_name = NULL;
+ OPENSSL_free(c->cache_peer_serv);
+ c->cache_peer_serv = NULL;
+
s = BIO_accept_ex(c->accept_sock, &c->cache_peer_addr,
c->accepted_mode);
s = BIO_accept_ex(c->accept_sock, &c->cache_peer_addr,
c->accepted_mode);
@@
-359,12
+363,12
@@
static int acpt_read(BIO *b, char *out, int outl)
while (b->next_bio == NULL) {
ret = acpt_state(b, data);
if (ret <= 0)
while (b->next_bio == NULL) {
ret = acpt_state(b, data);
if (ret <= 0)
- return
(ret)
;
+ return
ret
;
}
ret = BIO_read(b->next_bio, out, outl);
BIO_copy_next_retry(b);
}
ret = BIO_read(b->next_bio, out, outl);
BIO_copy_next_retry(b);
- return
(ret)
;
+ return
ret
;
}
static int acpt_write(BIO *b, const char *in, int inl)
}
static int acpt_write(BIO *b, const char *in, int inl)
@@
-378,12
+382,12
@@
static int acpt_write(BIO *b, const char *in, int inl)
while (b->next_bio == NULL) {
ret = acpt_state(b, data);
if (ret <= 0)
while (b->next_bio == NULL) {
ret = acpt_state(b, data);
if (ret <= 0)
- return
(ret)
;
+ return
ret
;
}
ret = BIO_write(b->next_bio, in, inl);
BIO_copy_next_retry(b);
}
ret = BIO_write(b->next_bio, in, inl);
BIO_copy_next_retry(b);
- return
(ret)
;
+ return
ret
;
}
static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
}
static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
@@
-450,7
+454,6
@@
static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
data->accepted_mode &= ~BIO_SOCK_NONBLOCK;
break;
case BIO_C_SET_FD:
data->accepted_mode &= ~BIO_SOCK_NONBLOCK;
break;
case BIO_C_SET_FD:
- b->init = 1;
b->num = *((int *)ptr);
data->accept_sock = b->num;
data->state = ACPT_S_ACCEPT;
b->num = *((int *)ptr);
data->accept_sock = b->num;
data->state = ACPT_S_ACCEPT;
@@
-527,7
+530,7
@@
static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = 0;
break;
}
ret = 0;
break;
}
- return
(ret)
;
+ return
ret
;
}
static int acpt_puts(BIO *bp, const char *str)
}
static int acpt_puts(BIO *bp, const char *str)
@@
-536,7
+539,7
@@
static int acpt_puts(BIO *bp, const char *str)
n = strlen(str);
ret = acpt_write(bp, str, n);
n = strlen(str);
ret = acpt_write(bp, str, n);
- return
(ret)
;
+ return
ret
;
}
BIO *BIO_new_accept(const char *str)
}
BIO *BIO_new_accept(const char *str)
@@
-545,11
+548,11
@@
BIO *BIO_new_accept(const char *str)
ret = BIO_new(BIO_s_accept());
if (ret == NULL)
ret = BIO_new(BIO_s_accept());
if (ret == NULL)
- return
(NULL)
;
+ return
NULL
;
if (BIO_set_accept_name(ret, str))
if (BIO_set_accept_name(ret, str))
- return
(ret)
;
+ return
ret
;
BIO_free(ret);
BIO_free(ret);
- return
(NULL)
;
+ return
NULL
;
}
#endif
}
#endif