kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inline bio_set.

Browse Source 
It's only called in one place. The comment about stack-allocated BIOs no
longer applies.

Change-Id: I5a3cec30bcb46bf1ee2bffd6117485383520b314
Reviewed-on: https://boringssl-review.googlesource.com/8902
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2016-07-25 14:05:17 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 12d2c48086
commit ebec9c341b
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crypto/bio/bio.c
View File

@ -68,25 +68,6 @@
#include "../internal.h" #include "../internal.h"
/* BIO_set initialises a BIO structure to have the given type and sets the
* reference count to one. It returns one on success or zero on error. */
static int bio_set(BIO *bio, const BIO_METHOD *method) {
/* This function can be called with a stack allocated |BIO| so we have to
* assume that the contents of |BIO| are arbitary. This also means that it'll
* leak memory if you call |BIO_set| twice on the same BIO. */
memset(bio, 0, sizeof(BIO));
bio->method = method;
bio->shutdown = 1;
bio->references = 1;
if (method->create != NULL && !method->create(bio)) {
return 0;
}
return 1;
}
BIO *BIO_new(const BIO_METHOD *method) { BIO *BIO_new(const BIO_METHOD *method) {
BIO *ret = OPENSSL_malloc(sizeof(BIO)); BIO *ret = OPENSSL_malloc(sizeof(BIO));
if (ret == NULL) { if (ret == NULL) {
@ -94,9 +75,14 @@ BIO *BIO_new(const BIO_METHOD *method) {
return NULL; return NULL;
} }
if (!bio_set(ret, method)) { memset(ret, 0, sizeof(BIO));
ret->method = method;
ret->shutdown = 1;
ret->references = 1;
if (method->create != NULL && !method->create(ret)) {
OPENSSL_free(ret); OPENSSL_free(ret);
ret = NULL; return NULL;
} }
return ret; return ret;