commit 1148ecd70624358b8f59b5cc9865c6f80680a7c1
author Kenny Root <kroot@google.com> Wed May 17 17:23:52 2017 -0700
committer Kenny Root <kenny@the-b.org> Wed May 17 19:59:49 2017 -0700
tree 8387ffaf0ead48e8e1f614fd1b5744be26962623
parent 4067a5b660ca24c2ef34732a2a43f5d0b8e8eb05

Fix length checks for signed vs unsigned

common/src/jni/main/cpp/NativeCrypto.cpp

diff --git a/common/src/jni/main/cpp/NativeCrypto.cpp b/common/src/jni/main/cpp/NativeCrypto.cpp
index a18ae5c..b8ca3c3 100644
--- a/common/src/jni/main/cpp/NativeCrypto.cpp
+++ b/common/src/jni/main/cpp/NativeCrypto.cpp
@@ -8599,7 +8599,7 @@
     if (bio == nullptr) {
         return -1;
     }
-    if (BIO_ctrl_get_write_guarantee(bio) < len) {
+    if (len < 0 || BIO_ctrl_get_write_guarantee(bio) < static_cast<size_t>(len)) {
         // The network BIO couldn't handle the entire write. Don't write anything, so that we
         // only process one packet at a time.
         return 0;
@@ -8652,7 +8652,7 @@
     if (bio == nullptr) {
         return -1;
     }
-    if (BIO_ctrl_get_write_guarantee(bio) < sourceLength) {
+    if (sourceLength < 0 || BIO_ctrl_get_write_guarantee(bio) < static_cast<size_t>(sourceLength)) {
         // The network BIO couldn't handle the entire write. Don't write anything, so that we
         // only process one packet at a time.
         return 0;