commit 93c332b08645e63645bf05fd74c15bcf377378ea
author David Benjamin <davidben@google.com> Tue Dec 06 22:29:48 2016 -0500
committer Adam Langley <agl@google.com> Wed Dec 07 23:58:40 2016 +0000
tree 594e6e316bb56a5c3b7b4a1832b6d148456a9967
parent ed1d288a919f5e340564f8ac854f940e6e3baf07

Tighten BIO_new_bio_pair.

This can be a bit shorter.

Change-Id: Ibccd1e90e7c0842d0d3951a070a68e075136657c
Reviewed-on: https://boringssl-review.googlesource.com/12627
Reviewed-by: Adam Langley <agl@google.com>

crypto/bio/pair.c

diff --git a/crypto/bio/pair.c b/crypto/bio/pair.c
index 7c5c76f..df36343 100644
--- a/crypto/bio/pair.c
+++ b/crypto/bio/pair.c
@@ -462,34 +462,20 @@
 
 int BIO_new_bio_pair(BIO** bio1_p, size_t writebuf1_len,
                      BIO** bio2_p, size_t writebuf2_len) {
-  BIO *bio1 = NULL, *bio2 = NULL;
-  int ret = 0;
-
-  bio1 = BIO_new(bio_s_bio());
-  if (bio1 == NULL) {
-    goto err;
-  }
-  bio2 = BIO_new(bio_s_bio());
-  if (bio2 == NULL) {
-    goto err;
-  }
-
-  if (!bio_make_pair(bio1, bio2, writebuf1_len, writebuf2_len)) {
-    goto err;
-  }
-  ret = 1;
-
-err:
-  if (ret == 0) {
+  BIO *bio1 = BIO_new(bio_s_bio());
+  BIO *bio2 = BIO_new(bio_s_bio());
+  if (bio1 == NULL || bio2 == NULL ||
+      !bio_make_pair(bio1, bio2, writebuf1_len, writebuf2_len)) {
     BIO_free(bio1);
-    bio1 = NULL;
     BIO_free(bio2);
-    bio2 = NULL;
+    *bio1_p = NULL;
+    *bio2_p = NULL;
+    return 0;
   }
 
   *bio1_p = bio1;
   *bio2_p = bio2;
-  return ret;
+  return 1;
 }
 
 size_t BIO_ctrl_get_read_request(BIO *bio) {