Merge "keystore: replace VLA with vector" am: 9c6612e264 am: 451f205ba2 am: 87884b141f
am: 1f30270bc0
Change-Id: Ic914fc198e9dc80b0493797ffc9f889f99d00928
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 90cfdb1..6ec8ce5 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -116,22 +116,22 @@
}
android::String8 KeyStore::getKeyName(const android::String8& keyName) {
- char encoded[encode_key_length(keyName) + 1]; // add 1 for null char
- encode_key(encoded, keyName);
- return android::String8(encoded);
+ std::vector<char> encoded(encode_key_length(keyName) + 1); // add 1 for null char
+ encode_key(encoded.data(), keyName);
+ return android::String8(encoded.data());
}
android::String8 KeyStore::getKeyNameForUid(const android::String8& keyName, uid_t uid) {
- char encoded[encode_key_length(keyName) + 1]; // add 1 for null char
- encode_key(encoded, keyName);
- return android::String8::format("%u_%s", uid, encoded);
+ std::vector<char> encoded(encode_key_length(keyName) + 1); // add 1 for null char
+ encode_key(encoded.data(), keyName);
+ return android::String8::format("%u_%s", uid, encoded.data());
}
android::String8 KeyStore::getKeyNameForUidWithDir(const android::String8& keyName, uid_t uid) {
- char encoded[encode_key_length(keyName) + 1]; // add 1 for null char
- encode_key(encoded, keyName);
+ std::vector<char> encoded(encode_key_length(keyName) + 1); // add 1 for null char
+ encode_key(encoded.data(), keyName);
return android::String8::format("%s/%u_%s", getUserStateByUid(uid)->getUserDirName(), uid,
- encoded);
+ encoded.data());
}
void KeyStore::resetUser(uid_t userId, bool keepUnenryptedEntries) {