mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-31 01:43:03 +08:00
50ed179e9a
Use BUILDFLAG(IS_*) instead of defined(OS_*).
This was generated mostly mechnically by performing the following steps:
- sed -i '' -E -e 's/defined\(OS_/BUILDFLAG(IS_/g' \
-e 's%([ !])OS_([A-Z]+)%\1BUILDFLAG(IS_\2)%g' \
$(git grep -l 'OS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- sed -i '' -e 's/#ifdef BUILDFLAG(/#if BUILDFLAG(/' \
$(git grep -l '#ifdef BUILDFLAG('
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- gsed -i -z -E -e \
's%(.*)#include "%\1#include "build/buildflag.h"\n#include "%' \
$(git grep -l 'BUILDFLAG(IS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- Spot checks to move #include "build/buildflag.h" to the correct parts
of files.
- sed -i '' -E -e \
's%^(#include "build/buildflag.h")$%#include "build/build_config.h"\n\1%' \
$(grep -L '^#include "build/build_config.h"$'
$(git grep -l 'BUILDFLAG(IS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm'))
- Add “clang-format off” around tool usage messages.
- git cl format
- Update mini_chromium to 85ba51f98278 (intermediate step).
TESTING ONLY).
- for f in $(git grep -l '^#include "build/buildflag.h"$'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm'); do \
grep -v '^#include "build/buildflag.h"$' "${f}" > /tmp/z; \
cp /tmp/z "${f}"; done
- git cl format
- Update mini_chromium to 735143774c5f (intermediate step).
- Update mini_chromium to f41420eb45fa (as checked in).
- Update mini_chromium to 6e2f204b4ae1 (as checked in).
For ease of review and inspection, each of these steps is uploaded as a
new patch set in a review series.
This includes an update of mini_chromium to 6e2f204b4ae1:
f41420eb45fa Use BUILDFLAG for OS checking
6e2f204b4ae1 Include what you use: string_util.h uses build_config.h
Bug: chromium:1234043
Change-Id: Ieef86186f094c64e59b853729737e36982f8cf69
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3400258
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
102 lines
3.5 KiB
C++
102 lines
3.5 KiB
C++
// Copyright 2017 The Crashpad Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "util/process/process_memory_range.h"
|
|
|
|
#include <limits>
|
|
|
|
#include "base/cxx17_backports.h"
|
|
#include "build/build_config.h"
|
|
#include "gtest/gtest.h"
|
|
#include "test/process_type.h"
|
|
#include "util/misc/from_pointer_cast.h"
|
|
#include "util/process/process_memory_native.h"
|
|
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
#include "test/linux/fake_ptrace_connection.h"
|
|
#endif
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
namespace {
|
|
|
|
struct TestObject {
|
|
char string1[16];
|
|
char string2[16];
|
|
} kTestObject = {"string1", "string2"};
|
|
|
|
TEST(ProcessMemoryRange, Basic) {
|
|
#if defined(ARCH_CPU_64_BITS)
|
|
constexpr bool is_64_bit = true;
|
|
#else
|
|
constexpr bool is_64_bit = false;
|
|
#endif // ARCH_CPU_64_BITS
|
|
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
FakePtraceConnection connection;
|
|
ASSERT_TRUE(connection.Initialize(GetSelfProcess()));
|
|
ProcessMemoryLinux memory(&connection);
|
|
#else
|
|
ProcessMemoryNative memory;
|
|
ASSERT_TRUE(memory.Initialize(GetSelfProcess()));
|
|
#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
|
|
// BUILDFLAG(IS_CHROMEOS)
|
|
|
|
ProcessMemoryRange range;
|
|
ASSERT_TRUE(range.Initialize(&memory, is_64_bit));
|
|
EXPECT_EQ(range.Is64Bit(), is_64_bit);
|
|
|
|
// Both strings are accessible within the object's range.
|
|
auto object_addr = FromPointerCast<VMAddress>(&kTestObject);
|
|
EXPECT_TRUE(range.RestrictRange(object_addr, sizeof(kTestObject)));
|
|
|
|
TestObject object;
|
|
ASSERT_TRUE(range.Read(object_addr, sizeof(object), &object));
|
|
EXPECT_EQ(memcmp(&object, &kTestObject, sizeof(object)), 0);
|
|
|
|
std::string string;
|
|
auto string1_addr = FromPointerCast<VMAddress>(kTestObject.string1);
|
|
auto string2_addr = FromPointerCast<VMAddress>(kTestObject.string2);
|
|
ASSERT_TRUE(range.ReadCStringSizeLimited(
|
|
string1_addr, base::size(kTestObject.string1), &string));
|
|
EXPECT_STREQ(string.c_str(), kTestObject.string1);
|
|
|
|
ASSERT_TRUE(range.ReadCStringSizeLimited(
|
|
string2_addr, base::size(kTestObject.string2), &string));
|
|
EXPECT_STREQ(string.c_str(), kTestObject.string2);
|
|
|
|
// Limit the range to remove access to string2.
|
|
ProcessMemoryRange range2;
|
|
ASSERT_TRUE(range2.Initialize(range));
|
|
ASSERT_TRUE(
|
|
range2.RestrictRange(string1_addr, base::size(kTestObject.string1)));
|
|
EXPECT_TRUE(range2.ReadCStringSizeLimited(
|
|
string1_addr, base::size(kTestObject.string1), &string));
|
|
EXPECT_FALSE(range2.ReadCStringSizeLimited(
|
|
string2_addr, base::size(kTestObject.string2), &string));
|
|
EXPECT_FALSE(range2.Read(object_addr, sizeof(object), &object));
|
|
|
|
// String reads fail if the NUL terminator is outside the range.
|
|
ASSERT_TRUE(range2.RestrictRange(string1_addr, strlen(kTestObject.string1)));
|
|
EXPECT_FALSE(range2.ReadCStringSizeLimited(
|
|
string1_addr, base::size(kTestObject.string1), &string));
|
|
|
|
// New range outside the old range.
|
|
EXPECT_FALSE(range2.RestrictRange(string1_addr - 1, 1));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace test
|
|
} // namespace crashpad
|