Merge "Avoid leaking property values into logs on error" (21aa749e) · Commits · e / os / android_system_core

init/property_service.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -557,9 +557,8 @@ static void handle_property_set_fd() {
		uint32_t result =
		HandlePropertySet(prop_name, prop_value, socket.source_context(), cr, &error);
		if (result != PROP_SUCCESS) {
		LOG(ERROR) << "Unable to set property '" << prop_name << "' to '" << prop_value
		<< "' from uid:" << cr.uid << " gid:" << cr.gid << " pid:" << cr.pid << ": "
		<< error;
		LOG(ERROR) << "Unable to set property '" << prop_name << "' from uid:" << cr.uid
		<< " gid:" << cr.gid << " pid:" << cr.pid << ": " << error;
		}

		break;
		@@ -579,9 +578,8 @@ static void handle_property_set_fd() {
		std::string error;
		uint32_t result = HandlePropertySet(name, value, socket.source_context(), cr, &error);
		if (result != PROP_SUCCESS) {
		LOG(ERROR) << "Unable to set property '" << name << "' to '" << value
		<< "' from uid:" << cr.uid << " gid:" << cr.gid << " pid:" << cr.pid << ": "
		<< error;
		LOG(ERROR) << "Unable to set property '" << name << "' from uid:" << cr.uid
		<< " gid:" << cr.gid << " pid:" << cr.pid << ": " << error;
		}
		socket.SendUint32(result);
		break;