commit ab9017b0ff9da51afa3594fa41c84b7c88e1115d
author Adam Langley <agl@google.com> Mon Apr 20 15:25:21 2015 -0700
committer Adam Langley <agl@google.com> Tue May 05 00:28:22 2015 +0000
tree b8ca5366c2e692a4e703231c204b9fb50fa6da43
parent a91fd063cf87b905a4d3b06387727deb4a7016d0

Revert "bio: remove reference count."

Android uses BIO reference counting.

This reverts commit 9bde6aeb76b1d2a45d76637553c3fb3f31e4ecbd.

Change-Id: Ibf4a7f42477549d10829a424ea3b52f09098666c
Reviewed-on: https://boringssl-review.googlesource.com/4472
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>

crypto/bio/bio.c

diff --git a/crypto/bio/bio.c b/crypto/bio/bio.c
index ad6c259..2fcad6c 100644
--- a/crypto/bio/bio.c
+++ b/crypto/bio/bio.c
@@ -75,6 +75,7 @@
 
   bio->method = method;
   bio->shutdown = 1;
+  bio->references = 1;
 
   if (method->create != NULL && !method->create(bio)) {
     return 0;
@@ -102,6 +103,11 @@
   BIO *next_bio;
 
   for (; bio != NULL; bio = next_bio) {
+    int refs = CRYPTO_add(&bio->references, -1, CRYPTO_LOCK_BIO);
+    if (refs > 0) {
+      return 0;
+    }
+
     if (bio->callback != NULL) {
       int i = (int)bio->callback(bio, BIO_CB_FREE, NULL, 0, 0, 1);
       if (i <= 0) {

include/openssl/bio.h

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index f0e2519..84996e9 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -781,6 +781,7 @@
   /* num is a BIO-specific value. For example, in fd BIOs it's used to store a
    * file descriptor. */
   int num;
+  int references;
   void *ptr;
   /* next_bio points to the next |BIO| in a chain. This |BIO| owns a reference
    * to |next_bio|. */