74 lines
3.2 KiB
Diff
74 lines
3.2 KiB
Diff
From 5afdc4d13ac997204873e734b20c30b6efc253d1 Mon Sep 17 00:00:00 2001
|
|
From: wangxiaochao <wangxiaochao2@huawei.com>
|
|
Date: Fri, 18 Mar 2022 14:46:35 +0800
|
|
Subject: [PATCH] fix CVE-2021-22570
|
|
|
|
Signed-off-by: wangxiaochao <wangxiaochao2@huawei.com>
|
|
|
|
---
|
|
src/google/protobuf/descriptor.cc | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
|
|
index 8998e1b..e6f7ec2 100644
|
|
--- a/src/google/protobuf/descriptor.cc
|
|
+++ b/src/google/protobuf/descriptor.cc
|
|
@@ -2626,6 +2626,8 @@ void Descriptor::DebugString(int depth, std::string* contents,
|
|
const Descriptor::ReservedRange* range = reserved_range(i);
|
|
if (range->end == range->start + 1) {
|
|
strings::SubstituteAndAppend(contents, "$0, ", range->start);
|
|
+ } else if (range->end > FieldDescriptor::kMaxNumber) {
|
|
+ strings::SubstituteAndAppend(contents, "$0 to max, ", range->start);
|
|
} else {
|
|
strings::SubstituteAndAppend(contents, "$0 to $1, ", range->start,
|
|
range->end - 1);
|
|
@@ -2829,6 +2831,8 @@ void EnumDescriptor::DebugString(
|
|
const EnumDescriptor::ReservedRange* range = reserved_range(i);
|
|
if (range->end == range->start) {
|
|
strings::SubstituteAndAppend(contents, "$0, ", range->start);
|
|
+ } else if (range->end == INT_MAX) {
|
|
+ strings::SubstituteAndAppend(contents, "$0 to max, ", range->start);
|
|
} else {
|
|
strings::SubstituteAndAppend(contents, "$0 to $1, ", range->start,
|
|
range->end);
|
|
@@ -4019,6 +4023,11 @@ bool DescriptorBuilder::AddSymbol(const std::string& full_name,
|
|
// Use its file as the parent instead.
|
|
if (parent == nullptr) parent = file_;
|
|
|
|
+ if (full_name.find('\0') != std::string::npos) {
|
|
+ AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
|
|
+ "\"" + full_name + "\" contains null character.");
|
|
+ return false;
|
|
+ }
|
|
if (tables_->AddSymbol(full_name, symbol)) {
|
|
if (!file_tables_->AddAliasUnderParent(parent, name, symbol)) {
|
|
// This is only possible if there was already an error adding something of
|
|
@@ -4059,6 +4068,11 @@ bool DescriptorBuilder::AddSymbol(const std::string& full_name,
|
|
void DescriptorBuilder::AddPackage(const std::string& name,
|
|
const Message& proto,
|
|
const FileDescriptor* file) {
|
|
+ if (name.find('\0') != std::string::npos) {
|
|
+ AddError(name, proto, DescriptorPool::ErrorCollector::NAME,
|
|
+ "\"" + name + "\" contains null character.");
|
|
+ return;
|
|
+ }
|
|
if (tables_->AddSymbol(name, Symbol(file))) {
|
|
// Success. Also add parent package, if any.
|
|
std::string::size_type dot_pos = name.find_last_of('.');
|
|
@@ -4372,6 +4386,12 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
|
|
}
|
|
result->pool_ = pool_;
|
|
|
|
+ if (result->name().find('\0') != std::string::npos) {
|
|
+ AddError(result->name(), proto, DescriptorPool::ErrorCollector::NAME,
|
|
+ "\"" + result->name() + "\" contains null character.");
|
|
+ return nullptr;
|
|
+ }
|
|
+
|
|
// Add to tables.
|
|
if (!tables_->AddFile(result)) {
|
|
AddError(proto.name(), proto, DescriptorPool::ErrorCollector::OTHER,
|
|
--
|
|
2.25.1
|
|
|