generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 770d0f61: Merge "Make sure not to construct illegal property names."

Browse Source 
* commit '770d0f6177ca1ad242b509151fb612f07ef8a07b':
  Make sure not to construct illegal property names.
This commit is contained in:
Christopher Ferris
2014-07-16 02:56:23 +00:00
committed by Android Git Automerger
parent f64411e7a8 770d0f6177
commit 04e7056d06
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
benchmarks/property_benchmark.cpp
View File

@@ -28,12 +28,14 @@
extern void *__system_property_area__; extern void *__system_property_area__;
// Do not exceed 512, that is about the largest number of properties
// that can be created with the current property area size.
#define TEST_NUM_PROPS \ #define TEST_NUM_PROPS \
Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(256)->Arg(512)->Arg(1024) Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(256)->Arg(512)
struct LocalPropertyTestState { struct LocalPropertyTestState {
LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) { LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_"; static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_.";
const char* android_data = getenv("ANDROID_DATA"); const char* android_data = getenv("ANDROID_DATA");
if (android_data == NULL) { if (android_data == NULL) {
@@ -66,18 +68,38 @@ struct LocalPropertyTestState {
srandom(nprops); srandom(nprops);
for (int i = 0; i < nprops; i++) { for (int i = 0; i < nprops; i++) {
name_lens[i] = random() % PROP_NAME_MAX; // Make sure the name has at least 10 characters to make
// it very unlikely to generate the same random name.
name_lens[i] = (random() % (PROP_NAME_MAX - 10)) + 10;
names[i] = new char[PROP_NAME_MAX + 1]; names[i] = new char[PROP_NAME_MAX + 1];
size_t prop_name_len = sizeof(prop_name_chars) - 1;
for (int j = 0; j < name_lens[i]; j++) { for (int j = 0; j < name_lens[i]; j++) {
names[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)]; if (j == 0 || names[i][j-1] == '.' || j == name_lens[i] - 1) {
// Certain values are not allowed:
// - Don't start name with '.'
// - Don't allow '.' to appear twice in a row
// - Don't allow the name to end with '.'
// This assumes that '.' is the last character in the
// array so that decrementing the length by one removes
// the value from the possible values.
prop_name_len--;
}
names[i][j] = prop_name_chars[random() % prop_name_len];
} }
names[i][name_lens[i]] = 0; names[i][name_lens[i]] = 0;
value_lens[i] = random() % PROP_VALUE_MAX;
// Make sure the value contains at least 1 character.
value_lens[i] = (random() % (PROP_VALUE_MAX - 1)) + 1;
values[i] = new char[PROP_VALUE_MAX]; values[i] = new char[PROP_VALUE_MAX];
for (int j = 0; j < value_lens[i]; j++) { for (int j = 0; j < value_lens[i]; j++) {
values[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)]; values[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)];
} }
__system_property_add(names[i], name_lens[i], values[i], value_lens[i]);
if (__system_property_add(names[i], name_lens[i], values[i], value_lens[i]) < 0) {
printf("Failed to add a property, terminating...\n");
printf("%s = %.*s\n", names[i], value_lens[i], values[i]);
exit(1);
}
} }
valid = true; valid = true;