commit d24b8183b93e781080b2c16c487e60d51c12da31
author The Android Open Source Project <initial-contribution@android.com> Tue Feb 10 15:44:00 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Tue Feb 10 15:44:00 2009 -0800
tree fbb89154858984eb8e41556da7e9433040d55cd4
parent f1e484acb594a726fb57ad0ae4cfe902c7f35858

auto import from //branches/cupcake/...@130745

libs/utils/String8.cpp

diff --git a/libs/utils/String8.cpp b/libs/utils/String8.cpp
index ab843f6..c50d343 100644
--- a/libs/utils/String8.cpp
+++ b/libs/utils/String8.cpp
@@ -317,8 +317,10 @@
         ->editResize(myLen+otherLen+1);
     if (buf) {
         char* str = (char*)buf->data();
-        memcpy(str+myLen, other, otherLen+1);
         mString = str;
+        str += myLen;
+        memcpy(str, other, otherLen);
+        str[otherLen] = '\0';
         return NO_ERROR;
     }
     return NO_MEMORY;