mirror of
https://github.com/chromium/crashpad.git
synced 2025-03-10 06:36:02 +00: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>
87 lines
2.1 KiB
C++
87 lines
2.1 KiB
C++
// Copyright 2020 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/misc/no_cfi_icall.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "build/build_config.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include <windows.h>
|
|
|
|
#include "util/win/get_function.h"
|
|
#else
|
|
#include <dlfcn.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
namespace {
|
|
|
|
TEST(NoCfiIcall, NullptrIsFalse) {
|
|
NoCfiIcall<void (*)(void) noexcept> call(nullptr);
|
|
ASSERT_FALSE(call);
|
|
}
|
|
|
|
int TestFunc() noexcept {
|
|
return 42;
|
|
}
|
|
|
|
TEST(NoCfiIcall, SameDSOICall) {
|
|
NoCfiIcall<decltype(TestFunc)*> call(&TestFunc);
|
|
ASSERT_TRUE(call);
|
|
ASSERT_EQ(call(), 42);
|
|
}
|
|
|
|
TEST(NoCfiIcall, CrossDSOICall) {
|
|
#if BUILDFLAG(IS_WIN)
|
|
static const NoCfiIcall<decltype(GetCurrentProcessId)*> call(
|
|
GET_FUNCTION_REQUIRED(L"kernel32.dll", GetCurrentProcessId));
|
|
ASSERT_TRUE(call);
|
|
EXPECT_EQ(call(), GetCurrentProcessId());
|
|
#else
|
|
static const NoCfiIcall<decltype(getpid)*> call(dlsym(RTLD_NEXT, "getpid"));
|
|
ASSERT_TRUE(call);
|
|
EXPECT_EQ(call(), getpid());
|
|
#endif
|
|
}
|
|
|
|
TEST(NoCfiIcall, Args) {
|
|
#if !BUILDFLAG(IS_WIN)
|
|
static const NoCfiIcall<decltype(snprintf)*> call(
|
|
dlsym(RTLD_NEXT, "snprintf"));
|
|
ASSERT_TRUE(call);
|
|
|
|
char buf[1024];
|
|
|
|
// Regular args.
|
|
memset(buf, 0, sizeof(buf));
|
|
ASSERT_GT(call(buf, sizeof(buf), "Hello!"), 0);
|
|
EXPECT_STREQ(buf, "Hello!");
|
|
|
|
// Variadic args.
|
|
memset(buf, 0, sizeof(buf));
|
|
ASSERT_GT(call(buf, sizeof(buf), "%s, %s!", "Hello", "World"), 0);
|
|
EXPECT_STREQ(buf, "Hello, World!");
|
|
#endif
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace test
|
|
} // namespace crashpad
|