Ensure that BIO_[w]pending isn't confused about negative numbers.
It's possible that a BIO implementation could return a negative number
(say -1) for BIO_CTRL_PENDING or BIO_CTRL_WPENDING. Assert that this
doesn't happen and map it to zero if it happens anyway in NDEBUG builds.
Change-Id: Ie01214e80ff19acc1c7681a1125bbbf2038679c3
Reviewed-on: https://boringssl-review.googlesource.com/11700
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/crypto/bio/bio.c b/crypto/bio/bio.c
index 8f8a196..52475f9 100644
--- a/crypto/bio/bio.c
+++ b/crypto/bio/bio.c
@@ -336,7 +336,13 @@
}
size_t BIO_pending(const BIO *bio) {
- return BIO_ctrl((BIO *) bio, BIO_CTRL_PENDING, 0, NULL);
+ const long r = BIO_ctrl((BIO *) bio, BIO_CTRL_PENDING, 0, NULL);
+ assert(r >= 0);
+
+ if (r < 0) {
+ return 0;
+ }
+ return r;
}
size_t BIO_ctrl_pending(const BIO *bio) {
@@ -344,7 +350,13 @@
}
size_t BIO_wpending(const BIO *bio) {
- return BIO_ctrl((BIO *) bio, BIO_CTRL_WPENDING, 0, NULL);
+ const long r = BIO_ctrl((BIO *) bio, BIO_CTRL_WPENDING, 0, NULL);
+ assert(r >= 0);
+
+ if (r < 0) {
+ return 0;
+ }
+ return r;
}
int BIO_set_close(BIO *bio, int close_flag) {
