commit 85a6ba8a2e3dcfc5cb2b4482fbbf94fe9f1a0236
author Nick Kralevich <nnk@google.com> Thu Aug 27 18:11:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 27 18:11:21 2015 +0000
tree b69545d642ba8f24664fffa2f75a5cea8c8be68d
parent aaf8ed5a8c215bd30d6c69f95b708c6ace6911ee
parent 6283b20209b7b739e058f46bcd814da9e02037fb

am 212e4f1f: am d34f4198: Merge "strdup16to8.c: fix benign integer underflow."

* commit '212e4f1fe1c4f8390c3cada607e00bc9d9717eba':
  strdup16to8.c: fix benign integer underflow.

libcutils/strdup16to8.c

diff --git a/libcutils/strdup16to8.c b/libcutils/strdup16to8.c
index 1a8ba86..4dc987e 100644
--- a/libcutils/strdup16to8.c
+++ b/libcutils/strdup16to8.c
@@ -55,7 +55,8 @@
     /* Fast path for the usual case where 3*len is < SIZE_MAX-1.
      */
     if (len < (SIZE_MAX-1)/3) {
-        while (len--) {
+        while (len != 0) {
+            len--;
             unsigned int uic = *utf16Str++;
 
             if (uic > 0x07ff)
@@ -69,7 +70,8 @@
     }
 
     /* The slower but paranoid version */
-    while (len--) {
+    while (len != 0) {
+        len--;
         unsigned int  uic     = *utf16Str++;
         size_t        utf8Cur = utf8Len;
 
@@ -112,7 +114,8 @@
      * strnlen16to8() properly or at a minimum checked the result of
      * its malloc(SIZE_MAX) in case of overflow.
      */
-    while (len--) {
+    while (len != 0) {
+        len--;
         unsigned int uic = *utf16Str++;
 
         if (uic > 0x07ff) {