ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Only allow UTF8 encoded property values" am: 4ff2607ef7

Browse source 
am: 9c767212eb

Change-Id: Id6570217d27846113e71a717369513f5e386b836
This commit is contained in:
Tom Cherry 2017-10-17 16:18:55 +00:00 • committed by android-build-merger
commit fccffc8645
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/property_service.cpp
View file

@ -33,6 +33,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include <wchar.h>
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h> #include <sys/_system_properties.h>
@ -160,6 +161,12 @@ static uint32_t PropertySetImpl(const std::string& name, const std::string& valu
return PROP_ERROR_INVALID_VALUE; return PROP_ERROR_INVALID_VALUE;
} }
if (mbstowcs(nullptr, value.data(), 0) == static_cast<std::size_t>(-1)) {
LOG(ERROR) << "property_set(\"" << name << "\", \"" << value << "\") failed: "
<< "value not a UTF8 encoded string";
return PROP_ERROR_INVALID_VALUE;
}
prop_info* pi = (prop_info*) __system_property_find(name.c_str()); prop_info* pi = (prop_info*) __system_property_find(name.c_str());
if (pi != nullptr) { if (pi != nullptr) {
// ro.* properties are actually "write-once". // ro.* properties are actually "write-once".

17
init/property_service_test.cpp
View file

@ -21,8 +21,11 @@
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h> #include <sys/_system_properties.h>
#include <android-base/properties.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
using android::base::SetProperty;
namespace android { namespace android {
namespace init { namespace init {
@ -50,5 +53,19 @@ TEST(property_service, very_long_name_35166374) {
ASSERT_EQ(0, close(fd)); ASSERT_EQ(0, close(fd));
} }
TEST(property_service, non_utf8_value) {
ASSERT_TRUE(SetProperty("property_service_utf8_test", "base_success"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\x80"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xC2\x01"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xE0\xFF"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xE0\xA0\xFF"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x01\xFF"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x90\xFF"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x90\x80\xFF"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "\xF0\x90\x80"));
EXPECT_FALSE(SetProperty("property_service_utf8_test", "ab\xF0\x90\x80\x80qe\xF0\x90\x80"));
EXPECT_TRUE(SetProperty("property_service_utf8_test", "\xF0\x90\x80\x80"));
}
} // namespace init } // namespace init
} // namespace android } // namespace android