commit a77e809ecff5190790906fb7a3c527259c735071
author Douglas Leung <douglas@mips.com> Thu Jun 13 16:34:43 2013 -0700
committer Douglas Leung <douglas@mips.com> Thu Jun 13 17:35:30 2013 -0700
tree a2314c7f7d4965e877c24a6e1f1134315344b79a
parent 76820356cc3c9c399717198d7ec4943a96e0b341

Add 1 byte for the NULL char. This bug was causing CTS failures and stack corruption for Mips.

Change-Id: Ib7e8eb0e79ee55fffb8cf36371688ba544734029
Signed-off-by: Douglas Leung <douglas@mips.com>

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 9b08398..2859caf 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -905,19 +905,19 @@
     }
 
     android::String8 getKeyName(const android::String8& keyName) {
-        char encoded[encode_key_length(keyName)];
+        char encoded[encode_key_length(keyName) + 1];	// add 1 for null char
         encode_key(encoded, keyName);
         return android::String8(encoded);
     }
 
     android::String8 getKeyNameForUid(const android::String8& keyName, uid_t uid) {
-        char encoded[encode_key_length(keyName)];
+        char encoded[encode_key_length(keyName) + 1];	// add 1 for null char
         encode_key(encoded, keyName);
         return android::String8::format("%u_%s", uid, encoded);
     }
 
     android::String8 getKeyNameForUidWithDir(const android::String8& keyName, uid_t uid) {
-        char encoded[encode_key_length(keyName)];
+        char encoded[encode_key_length(keyName) + 1];	// add 1 for null char
         encode_key(encoded, keyName);
         return android::String8::format("%s/%u_%s", getUserState(uid)->getUserDirName(), uid,
                 encoded);