Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install Ninja
- name: Install Deps
run: sudo apt install -y liblzma-dev ninja-build

- name: Set reusable strings
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/googletest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ include (ExternalProject)
ExternalProject_Add(${GTEST_TARGET}
PREFIX ${GTEST_TARGET}
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.14.0
GIT_TAG v1.15.0
UPDATE_COMMAND ""
CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/protobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ include (ExternalProject)
ExternalProject_Add(${PROTOBUF_TARGET}
PREFIX ${PROTOBUF_TARGET}
GIT_REPOSITORY https://github.com/google/protobuf.git
GIT_TAG v27.1
GIT_TAG v29.3
UPDATE_COMMAND ""
CONFIGURE_COMMAND ${CMAKE_COMMAND} ${PROTOBUF_INSTALL_DIR}/src/${PROTOBUF_TARGET}
-G${CMAKE_GENERATOR}
Expand Down
2 changes: 1 addition & 1 deletion examples/libfuzzer/libfuzzer_bin_example.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ DEFINE_BINARY_PROTO_FUZZER(const libfuzzer_example::Msg& message) {
!std::isnan(message.optional_float()) &&
std::fabs(message.optional_float()) > 1000 &&
message.any().UnpackTo(&file) && !file.name().empty()) {
std::cerr << absl::StrCat(message) << "\n";
std::cerr << protobuf_mutator::protobuf::ShortFormat(message) << "\n";
abort();
}
}
2 changes: 1 addition & 1 deletion examples/libfuzzer/libfuzzer_example.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ DEFINE_PROTO_FUZZER(const libfuzzer_example::Msg& message) {
!std::isnan(message.optional_float()) &&
std::fabs(message.optional_float()) > 1000 &&
message.any().UnpackTo(&file) && !file.name().empty()) {
std::cerr << absl::StrCat(message) << "\n";
std::cerr << protobuf_mutator::protobuf::ShortFormat(message) << "\n";
abort();
}
}
6 changes: 3 additions & 3 deletions src/field_instance.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ class ConstFieldInstance {
const protobuf::FieldDescriptor* descriptor() const { return descriptor_; }

std::string DebugString() const {
std::string s = absl::StrCat(*descriptor_);
if (is_repeated()) s += absl::StrCat("[", index_, "]");
return s + " of\n" + absl::StrCat(*message_);
std::string s = descriptor_->DebugString();
if (is_repeated()) s += "[" + std::to_string(index_) + "]";
return s + " of\n" + protobuf::ShortFormat(*message_);
}

protected:
Expand Down
2 changes: 1 addition & 1 deletion src/mutator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ std::string Mutator::MutateUtf8String(const std::string& value,

bool Mutator::IsInitialized(const Message& message) const {
if (!keep_initialized_ || message.IsInitialized()) return true;
std::cerr << "Uninitialized: " << absl::StrCat(message) << "\n";
std::cerr << "Uninitialized: " << protobuf::ShortFormat(message) << "\n";
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions src/mutator_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ bool Mutate(const protobuf::Message& from, const protobuf::Message& to,
}

ADD_FAILURE() << "Failed to get from:\n"
<< absl::StrCat(from) << "\nto:\n"
<< absl::StrCat(to);
<< protobuf::ShortFormat(from) << "\nto:\n"
<< protobuf::ShortFormat(to);
return false;
}

Expand Down