开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 10

_service:tar_scm:protobuf.spec Changed

@@ -7,19 +7,16 @@
 
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
-Version:        3.14.0
-Release:        6
+Version:        3.19.6
+Release:        1
 License:        BSD
 URL:            https://github.com/protocolbuffers/protobuf
 Source:         https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz
 Source1:        protobuf-init.el
+%global so_version 30
 
 Patch9000:      0001-add-secure-compile-option-in-Makefile.patch
 Patch9001:      0002-add-secure-compile-fs-check-in-Makefile.patch
-Patch9002:      0003-fix-CVE-2021-22570.patch
-Patch9003:      0004-Improve-performance-of-parsing-unknown-fields-in-Jav.patch
-Patch9004:	0005-fix-CVE-2022-1941.patch
-Patch9005:	0006-fix-CVE-2022-3171.patch
 
 BuildRequires:  make autoconf automake emacs gcc-c++ libtool pkgconfig zlib-devel
 
@@ -162,10 +159,11 @@
 %if %{with java}
 #%pom_remove_dep com.google.truth:truth java/pom.xml
 #%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/*/pom.xml
-%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
+#%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
 %pom_remove_dep com.google.truth:truth java/pom.xml java/util/pom.xml java/lite/pom.xml java/core/pom.xml
 %pom_remove_dep com.google.errorprone:error_prone_annotations java/util/pom.xml
 %pom_remove_dep com.google.guava:guava-testlib java/pom.xml java/util/pom.xml
+%pom_remove_dep com.google.j2objc:j2objc-annotations java/util/pom.xml
 
 # These use easymockclassextension
 rm java/core/src/test/java/com/google/protobuf/ServiceTest.java
@@ -216,7 +214,9 @@
 %endif
 
 %if %{with java}
-%mvn_build -s -- -f java/pom.xml
+%pom_disable_module kotlin java/pom.xml
+%pom_disable_module kotlin-lite java/pom.xml
+%mvn_build -s -- -Dmaven.test.skip=true -f java/pom.xml
 %endif
 
 %{_emacs_bytecompile} editors/protobuf-mode.el
@@ -263,11 +263,11 @@
 %files
 %doc CHANGES.txt CONTRIBUTORS.txt README.md
 %license LICENSE
-%{_libdir}/libprotobuf.so.25*
+%{_libdir}/libprotobuf.so.%{so_version}{,.*}
 
 %files compiler
 %{_bindir}/protoc
-%{_libdir}/libprotoc.so.25*
+%{_libdir}/libprotoc.so.%{so_version}{,.*}
 %{_emacs_sitelispdir}/%{name}/
 %{_emacs_sitestartdir}/protobuf-init.el
 %license LICENSE
@@ -286,7 +286,7 @@
 %{_datadir}/vim/vimfiles/syntax/proto.vim
  
 %files lite
-%{_libdir}/libprotobuf-lite.so.25*
+%{_libdir}/libprotobuf-lite.so.%{so_version}{,.*}
 
 %files lite-devel
 %{_libdir}/libprotobuf-lite.so
@@ -325,6 +325,9 @@
 %endif
 
 %changelog
+* Mon Jul 17 2023 zhongtao <zhongtao17@huawei.com> - 3.19.6-1
+- update to 3.19.6
+
 * Tue Oct 18 2022 chengzeruizhi <chengzeruizhi@huawei.com> - 3.14.0-6
 - Type:bugfix
 - ID:NA

_service:tar_scm:0001-add-secure-compile-option-in-Makefile.patch Changed

_service:tar_scm:0002-add-secure-compile-fs-check-in-Makefile.patch Changed

_service:tar_scm:0003-fix-CVE-2021-22570.patch Deleted

@@ -1,73 +0,0 @@
-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
-

_service:tar_scm:0004-Improve-performance-of-parsing-unknown-fields-in-Jav.patch Deleted

@@ -1,1272 +0,0 @@
-From 8890b0a81e2f4b1de4a33cc6d81aba07655bde1a Mon Sep 17 00:00:00 2001
-From: wangxiaochao <wangxiaochao2@huawei.com>
-Date: Thu, 24 Mar 2022 20:54:36 +0800
-Subject: PATCH Improve performance of parsing unknown fields in Java
-
-Signed-off-by: wangxiaochao <wangxiaochao2@huawei.com>
-
----
- Makefile.am                                   |   1 +
- .../com/google/protobuf/UnknownFieldSet.java  | 427 +++++++++---------
- .../UnknownFieldSetPerformanceTest.java       |  78 ++++
- .../google/protobuf/UnknownFieldSetTest.java  | 171 ++++++-
- java/lite/pom.xml                             |   3 +-
- 5 files changed, 466 insertions(+), 214 deletions(-)
- create mode 100644 java/core/src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java
-
-diff --git a/Makefile.am b/Makefile.am
-index 4fc706b..908c2d2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -487,6 +487,7 @@ java_EXTRA_DIST=
-   java/core/src/test/java/com/google/protobuf/TypeRegistryTest.java                \
-   java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java            \
-   java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java             \
-+  java/core/src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java             \
-   java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java  \
-   java/core/src/test/java/com/google/protobuf/Utf8Test.java                        \
-   java/core/src/test/java/com/google/protobuf/Utf8Utils.java                       \
-diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java b/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
-index ba2f9df..5c482d6 100644
---- a/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
-+++ b/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
-@@ -43,13 +43,13 @@ import java.util.Map;
- import java.util.TreeMap;
- 
- /**
-- * {@code UnknownFieldSet} is used to keep track of fields which were seen when parsing a protocol
-+ * {@code UnknownFieldSet} keeps track of fields which were seen when parsing a protocol
-  * message but whose field numbers or types are unrecognized. This most frequently occurs when new
-  * fields are added to a message type and then messages containing those fields are read by old
-  * software that was compiled before the new types were added.
-  *
-  * <p>Every {@link Message} contains an {@code UnknownFieldSet} (and every {@link Message.Builder}
-- * contains an {@link Builder}).
-+ * contains a {@link Builder}).
-  *
-  * <p>Most users will never need to use this class.
-  *
-@@ -57,9 +57,13 @@ import java.util.TreeMap;
-  */
- public final class UnknownFieldSet implements MessageLite {
- 
--  private UnknownFieldSet() {
--    fields = null;
--    fieldsDescending = null;
-+  private final TreeMap<Integer, Field> fields;
-+
-+  /**
-+   * Construct an {@code UnknownFieldSet} around the given map.
-+   */
-+  UnknownFieldSet(TreeMap<Integer, Field> fields) {
-+    this.fields = fields;
-   }
- 
-   /** Create a new {@link Builder}. */
-@@ -68,7 +72,7 @@ public final class UnknownFieldSet implements MessageLite {
-   }
- 
-   /** Create a new {@link Builder} and initialize it to be a copy of {@code copyFrom}. */
--  public static Builder newBuilder(final UnknownFieldSet copyFrom) {
-+  public static Builder newBuilder(UnknownFieldSet copyFrom) {
-     return newBuilder().mergeFrom(copyFrom);
-   }
- 
-@@ -83,25 +87,11 @@ public final class UnknownFieldSet implements MessageLite {
-   }
- 
-   private static final UnknownFieldSet defaultInstance =
--      new UnknownFieldSet(
--          Collections.<Integer, Field>emptyMap(), Collections.<Integer, Field>emptyMap());
--
--  /**
--   * Construct an {@code UnknownFieldSet} around the given map. The map is expected to be immutable.
--   */
--  UnknownFieldSet(final Map<Integer, Field> fields, final Map<Integer, Field> fieldsDescending) {
--    this.fields = fields;
--    this.fieldsDescending = fieldsDescending;
--  }
--
--  private final Map<Integer, Field> fields;
--
--  /** A copy of {@link #fields} who's iterator order is reversed. */
--  private final Map<Integer, Field> fieldsDescending;
-+      new UnknownFieldSet(new TreeMap<Integer, Field>());
- 
- 
-   @Override
--  public boolean equals(final Object other) {
-+  public boolean equals(Object other) {
-     if (this == other) {
-       return true;
-     }
-@@ -110,29 +100,33 @@ public final class UnknownFieldSet implements MessageLite {
- 
-   @Override
-   public int hashCode() {
-+    if (fields.isEmpty()) { // avoid allocation of iterator.
-+      // This optimization may not be helpful but it is needed for the allocation tests to pass.
-+      return 0;
-+    }
-     return fields.hashCode();
-   }
- 
-   /** Get a map of fields in the set by number. */
-   public Map<Integer, Field> asMap() {
--    return fields;
-+    return (Map<Integer, Field>) fields.clone();
-   }
- 
-   /** Check if the given field number is present in the set. */
--  public boolean hasField(final int number) {
-+  public boolean hasField(int number) {
-     return fields.containsKey(number);
-   }
- 
-   /** Get a field by number. Returns an empty field if not present. Never returns {@code null}. */
--  public Field getField(final int number) {
--    final Field result = fields.get(number);
-+  public Field getField(int number) {
-+    Field result = fields.get(number);
-     return (result == null) ? Field.getDefaultInstance() : result;
-   }
- 
-   /** Serializes the set and writes it to {@code output}. */
-   @Override
--  public void writeTo(final CodedOutputStream output) throws IOException {
--    for (final Map.Entry<Integer, Field> entry : fields.entrySet()) {
-+  public void writeTo(CodedOutputStream output) throws IOException {
-+    for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-       Field field = entry.getValue();
-       field.writeTo(entry.getKey(), output);
-     }
-@@ -154,10 +148,10 @@ public final class UnknownFieldSet implements MessageLite {
-   @Override
-   public ByteString toByteString() {
-     try {
--      final ByteString.CodedBuilder out = ByteString.newCodedBuilder(getSerializedSize());
-+      ByteString.CodedBuilder out = ByteString.newCodedBuilder(getSerializedSize());
-       writeTo(out.getCodedOutput());
-       return out.build();
--    } catch (final IOException e) {
-+    } catch (IOException e) {
-       throw new RuntimeException(
-           "Serializing to a ByteString threw an IOException (should never happen).", e);
-     }
-@@ -170,12 +164,12 @@ public final class UnknownFieldSet implements MessageLite {
-   @Override
-   public byte toByteArray() {
-     try {
--      final byte result = new bytegetSerializedSize();
--      final CodedOutputStream output = CodedOutputStream.newInstance(result);
-+      byte result = new bytegetSerializedSize();
-+      CodedOutputStream output = CodedOutputStream.newInstance(result);
-       writeTo(output);
-       output.checkNoSpaceLeft();
-       return result;
--    } catch (final IOException e) {
-+    } catch (IOException e) {
-       throw new RuntimeException(
-           "Serializing to a byte array threw an IOException (should never happen).", e);
-     }
-@@ -186,16 +180,16 @@ public final class UnknownFieldSet implements MessageLite {
-    * {@link #writeTo(CodedOutputStream)}.
-    */
-   @Override
--  public void writeTo(final OutputStream output) throws IOException {
--    final CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-+  public void writeTo(OutputStream output) throws IOException {
-+    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-     writeTo(codedOutput);
-     codedOutput.flush();
-   }
- 
-   @Override
-   public void writeDelimitedTo(OutputStream output) throws IOException {
--    final CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
--    codedOutput.writeRawVarint32(getSerializedSize());
-+    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-+    codedOutput.writeUInt32NoTag(getSerializedSize());
-     writeTo(codedOutput);
-     codedOutput.flush();
-   }
-@@ -204,15 +198,17 @@ public final class UnknownFieldSet implements MessageLite {
-   @Override
-   public int getSerializedSize() {
-     int result = 0;
--    for (final Map.Entry<Integer, Field> entry : fields.entrySet()) {
--      result += entry.getValue().getSerializedSize(entry.getKey());
-+    if (!fields.isEmpty()) {

_service:tar_scm:0005-fix-CVE-2022-1941.patch Deleted

@@ -1,368 +0,0 @@
-From 55815e423bb82cc828836bbd60c79c1f9a195763 Mon Sep 17 00:00:00 2001
-From: Deanna Garcia <deannagarcia@google.com>
-Date: Tue, 13 Sep 2022 17:20:00 +0000
-Subject: PATCH Apply patch
-
----
- src/google/protobuf/extension_set_inl.h     |  27 +++--
- src/google/protobuf/wire_format.cc          |  26 +++--
- src/google/protobuf/wire_format_lite.h      |  27 +++--
- src/google/protobuf/wire_format_unittest.cc | 109 ++++++++++++++++++--
- 4 files changed, 152 insertions(+), 37 deletions(-)
-
-diff --git a/src/google/protobuf/extension_set_inl.h b/src/google/protobuf/extension_set_inl.h
-index 074784b96..77f95f62f 100644
---- a/src/google/protobuf/extension_set_inl.h
-+++ b/src/google/protobuf/extension_set_inl.h
-@@ -206,16 +206,21 @@ const char* ExtensionSet::ParseMessageSetItemTmpl(
-     const char* ptr, const Msg* containing_type,
-     internal::InternalMetadata* metadata, internal::ParseContext* ctx) {
-   std::string payload;
--  uint32 type_id = 0;
--  bool payload_read = false;
-+  uint32 type_id;
-+  enum class State { kNoTag, kHasType, kHasPayload, kDone };
-+  State state = State::kNoTag;
-+
-   while (!ctx->Done(&ptr)) {
-     uint32 tag = static_cast<uint8>(*ptr++);
-     if (tag == WireFormatLite::kMessageSetTypeIdTag) {
-       uint64 tmp;
-       ptr = ParseBigVarint(ptr, &tmp);
-       GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
--      type_id = tmp;
--      if (payload_read) {
-+      if (state == State::kNoTag) {
-+        type_id = tmp;
-+        state = State::kHasType;
-+      } else if (state == State::kHasPayload) {
-+        type_id = tmp;
-         ExtensionInfo extension;
-         bool was_packed_on_wire;
-         if (!FindExtension(2, type_id, containing_type, ctx, &extension,
-@@ -241,20 +246,24 @@ const char* ExtensionSet::ParseMessageSetItemTmpl(
-           GOOGLE_PROTOBUF_PARSER_ASSERT(value->_InternalParse(p, &tmp_ctx) &&
-                                          tmp_ctx.EndedAtLimit());
-         }
--        type_id = 0;
-+        state = State::kDone;
-       }
-     } else if (tag == WireFormatLite::kMessageSetMessageTag) {
--      if (type_id != 0) {
-+      if (state == State::kHasType) {
-         ptr = ParseFieldMaybeLazily(static_cast<uint64>(type_id) * 8 + 2, ptr,
-                                     containing_type, metadata, ctx);
-         GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
--        type_id = 0;
-+        state = State::kDone;
-       } else {
-+        std::string tmp;
-         int32 size = ReadSize(&ptr);
-         GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
--        ptr = ctx->ReadString(ptr, size, &payload);
-+        ptr = ctx->ReadString(ptr, size, &tmp);
-         GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
--        payload_read = true;
-+        if (state == State::kNoTag) {
-+          payload = std::move(tmp);
-+          state = State::kHasPayload;
-+        }
-       }
-     } else {
-       ptr = ReadTag(ptr - 1, &tag);
-diff --git a/src/google/protobuf/wire_format.cc b/src/google/protobuf/wire_format.cc
-index c30b7abff..382d01ea0 100644
---- a/src/google/protobuf/wire_format.cc
-+++ b/src/google/protobuf/wire_format.cc
-@@ -657,9 +657,11 @@ struct WireFormat::MessageSetParser {
-   const char* _InternalParse(const char* ptr, internal::ParseContext* ctx) {
-     // Parse a MessageSetItem
-     auto metadata = reflection->MutableInternalMetadata(msg);
-+    enum class State { kNoTag, kHasType, kHasPayload, kDone };
-+    State state = State::kNoTag;
-+
-     std::string payload;
-     uint32 type_id = 0;
--    bool payload_read = false;
-     while (!ctx->Done(&ptr)) {
-       // We use 64 bit tags in order to allow typeid's that span the whole
-       // range of 32 bit numbers.
-@@ -668,8 +670,11 @@ struct WireFormat::MessageSetParser {
-         uint64 tmp;
-         ptr = ParseBigVarint(ptr, &tmp);
-         GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
--        type_id = tmp;
--        if (payload_read) {
-+        if (state == State::kNoTag) {
-+          type_id = tmp;
-+          state = State::kHasType;
-+        } else if (state == State::kHasPayload) {
-+          type_id = tmp;
-           const FieldDescriptor* field;
-           if (ctx->data().pool == nullptr) {
-             field = reflection->FindKnownExtensionByNumber(type_id);
-@@ -696,17 +701,17 @@ struct WireFormat::MessageSetParser {
-             GOOGLE_PROTOBUF_PARSER_ASSERT(value->_InternalParse(p, &tmp_ctx) &&
-                                            tmp_ctx.EndedAtLimit());
-           }
--          type_id = 0;
-+          state = State::kDone;
-         }
-         continue;
-       } else if (tag == WireFormatLite::kMessageSetMessageTag) {
--        if (type_id == 0) {
-+        if (state == State::kNoTag) {
-           int32 size = ReadSize(&ptr);
-           GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-           ptr = ctx->ReadString(ptr, size, &payload);
-           GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
--          payload_read = true;
--        } else {
-+          state = State::kHasPayload;
-+        } else if (state == State::kHasType) {
-           // We're now parsing the payload
-           const FieldDescriptor* field = nullptr;
-           if (descriptor->IsExtensionNumber(type_id)) {
-@@ -720,7 +725,12 @@ struct WireFormat::MessageSetParser {
-           ptr = WireFormat::_InternalParseAndMergeField(
-               msg, ptr, ctx, static_cast<uint64>(type_id) * 8 + 2, reflection,
-               field);
--          type_id = 0;
-+          state = State::kDone;
-+        } else {
-+          int32 size = ReadSize(&ptr);
-+          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-+          ptr = ctx->Skip(ptr, size);
-+          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-         }
-       } else {
-         // An unknown field in MessageSetItem.
-diff --git a/src/google/protobuf/wire_format_lite.h b/src/google/protobuf/wire_format_lite.h
-index f2a3cad82..0b13096cc 100644
---- a/src/google/protobuf/wire_format_lite.h
-+++ b/src/google/protobuf/wire_format_lite.h
-@@ -1798,6 +1798,9 @@ bool ParseMessageSetItemImpl(io::CodedInputStream* input, MS ms) {
-   // we can parse it later.
-   std::string message_data;
- 
-+  enum class State { kNoTag, kHasType, kHasPayload, kDone };
-+  State state = State::kNoTag;
-+
-   while (true) {
-     const uint32 tag = input->ReadTagNoLastTag();
-     if (tag == 0) return false;
-@@ -1806,26 +1809,34 @@ bool ParseMessageSetItemImpl(io::CodedInputStream* input, MS ms) {
-       case WireFormatLite::kMessageSetTypeIdTag: {
-         uint32 type_id;
-         if (!input->ReadVarint32(&type_id)) return false;
--        last_type_id = type_id;
--
--        if (!message_data.empty()) {
-+        if (state == State::kNoTag) {
-+          last_type_id = type_id;
-+          state = State::kHasType;
-+        } else if (state == State::kHasPayload) {
-           // We saw some message data before the type_id.  Have to parse it
-           // now.
-           io::CodedInputStream sub_input(
-               reinterpret_cast<const uint8*>(message_data.data()),
-               static_cast<int>(message_data.size()));
-           sub_input.SetRecursionLimit(input->RecursionBudget());
--          if (!ms.ParseField(last_type_id, &sub_input)) {
-+          if (!ms.ParseField(type_id, &sub_input)) {
-             return false;
-           }
-           message_data.clear();
-+          state = State::kDone;
-         }
- 
-         break;
-       }
- 
-       case WireFormatLite::kMessageSetMessageTag: {
--        if (last_type_id == 0) {
-+        if (state == State::kHasType) {
-+          // Already saw type_id, so we can parse this directly.
-+          if (!ms.ParseField(last_type_id, input)) {
-+            return false;
-+          }
-+          state = State::kDone;
-+        } else if (state == State::kNoTag) {
-           // We haven't seen a type_id yet.  Append this data to message_data.
-           uint32 length;
-           if (!input->ReadVarint32(&length)) return false;
-@@ -1836,11 +1847,9 @@ bool ParseMessageSetItemImpl(io::CodedInputStream* input, MS ms) {
-           auto ptr = reinterpret_cast<uint8*>(&message_data0);
-           ptr = io::CodedOutputStream::WriteVarint32ToArray(length, ptr);
-           if (!input->ReadRaw(ptr, length)) return false;
-+          state = State::kHasPayload;
-         } else {

_service:tar_scm:0006-fix-CVE-2022-3171.patch Deleted

@@ -1,4924 +0,0 @@
-From 11ceafebd2234b5c3e559f6ae3d433bf0ed7f667 Mon Sep 17 00:00:00 2001
-From: chengzrz <czrzrichard@gmail.com>
-Date: Mon, 17 Oct 2022 21:43:05 +0800
-Subject: PATCH fix cve-2022-3171
-
-Signed-off-by: chengzrz <czrzrichard@gmail.com>
----
- .../com/google/protobuf/AbstractMessage.java  |  27 +-
- .../com/google/protobuf/ArrayDecoders.java    | 146 +++---
- .../com/google/protobuf/BinaryReader.java     |  32 +-
- .../protobuf/CodedInputStreamReader.java      |  51 +-
- .../DescriptorMessageInfoFactory.java         |   4 +-
- .../com/google/protobuf/DynamicMessage.java   |   5 +-
- .../com/google/protobuf/ExtensionSchema.java  |   1 +
- .../google/protobuf/ExtensionSchemaFull.java  |   5 +-
- .../google/protobuf/ExtensionSchemaLite.java  |  52 +-
- .../java/com/google/protobuf/FieldSet.java    |  63 ++-
- .../google/protobuf/GeneratedMessageLite.java | 169 ++++--
- .../google/protobuf/GeneratedMessageV3.java   | 110 +++-
- .../google/protobuf/MessageLiteToString.java  | 117 +++--
- .../google/protobuf/MessageReflection.java    | 439 +++++++++++++++-
- .../com/google/protobuf/MessageSchema.java    | 485 +++++++++++-------
- .../com/google/protobuf/MessageSetSchema.java |  17 +-
- .../protobuf/NewInstanceSchemaLite.java       |   5 +-
- .../main/java/com/google/protobuf/Reader.java |   8 +
- .../java/com/google/protobuf/SchemaUtil.java  |  30 +-
- .../java/com/google/protobuf/TextFormat.java  |   2 +-
- .../google/protobuf/UnknownFieldSetLite.java  |  38 +-
- .../protobuf/UnknownFieldSetLiteSchema.java   |  12 +-
- .../java/com/google/protobuf/LiteTest.java    |  36 +-
- .../google/protobuf/util/FieldMaskTree.java   |  10 +-
- .../protobuf/compiler/java/java_enum_field.cc |  94 ++--
- .../protobuf/compiler/java/java_enum_field.h  |  94 ++--
- .../protobuf/compiler/java/java_field.cc      |   4 +-
- .../protobuf/compiler/java/java_field.h       |   5 +-
- .../protobuf/compiler/java/java_map_field.cc  |  30 +-
- .../protobuf/compiler/java/java_map_field.h   |  34 +-
- .../protobuf/compiler/java/java_message.cc    | 220 ++------
- .../compiler/java/java_message_builder.cc     | 163 ++++--
- .../compiler/java/java_message_builder.h      |   5 +
- .../compiler/java/java_message_field.cc       | 126 ++---
- .../compiler/java/java_message_field.h        |  87 ++--
- .../compiler/java/java_primitive_field.cc     |  66 +--
- .../compiler/java/java_primitive_field.h      |  90 ++--
- .../compiler/java/java_string_field.cc        |  59 +--
- .../compiler/java/java_string_field.h         |  87 ++--
- 39 files changed, 1907 insertions(+), 1121 deletions(-)
-
-diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
-index 1364fce..ebf4318 100644
---- a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
-+++ b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
-@@ -426,27 +426,22 @@ public abstract class AbstractMessage
-         throws IOException {
-       boolean discardUnknown = input.shouldDiscardUnknownFields();
-       final UnknownFieldSet.Builder unknownFields =
--          discardUnknown ? null : UnknownFieldSet.newBuilder(getUnknownFields());
--      while (true) {
--        final int tag = input.readTag();
--        if (tag == 0) {
--          break;
--        }
--
--        MessageReflection.BuilderAdapter builderAdapter =
--            new MessageReflection.BuilderAdapter(this);
--        if (!MessageReflection.mergeFieldFrom(
--            input, unknownFields, extensionRegistry, getDescriptorForType(), builderAdapter, tag)) {
--          // end group tag
--          break;
--        }
--      }
-+          discardUnknown ? null : getUnknownFieldSetBuilder();
-+      MessageReflection.mergeMessageFrom(this, unknownFields, input, extensionRegistry);
-       if (unknownFields != null) {
--        setUnknownFields(unknownFields.build());
-+        setUnknownFieldSetBuilder(unknownFields);
-       }
-       return (BuilderType) this;
-     }
- 
-+    protected UnknownFieldSet.Builder getUnknownFieldSetBuilder() {
-+      return UnknownFieldSet.newBuilder(getUnknownFields());
-+    }
-+
-+    protected void setUnknownFieldSetBuilder(final UnknownFieldSet.Builder builder) {
-+      setUnknownFields(builder.build());
-+    }
-+
-     @Override
-     public BuilderType mergeUnknownFields(final UnknownFieldSet unknownFields) {
-       setUnknownFields(
-diff --git a/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java b/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
-index 1217e11..39b7927 100644
---- a/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
-+++ b/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
-@@ -234,6 +234,29 @@ final class ArrayDecoders {
-   @SuppressWarnings({"unchecked", "rawtypes"})
-   static int decodeMessageField(
-       Schema schema, byte data, int position, int limit, Registers registers) throws IOException {
-+    Object msg = schema.newInstance();
-+    int offset = mergeMessageField(msg, schema, data, position, limit, registers);
-+    schema.makeImmutable(msg);
-+    registers.object1 = msg;
-+    return offset;
-+  }
-+
-+  /** Decodes a group value. */
-+  @SuppressWarnings({"unchecked", "rawtypes"})
-+  static int decodeGroupField(
-+      Schema schema, byte data, int position, int limit, int endGroup, Registers registers)
-+      throws IOException {
-+    Object msg = schema.newInstance();
-+    int offset = mergeGroupField(msg, schema, data, position, limit, endGroup, registers);
-+    schema.makeImmutable(msg);
-+    registers.object1 = msg;
-+    return offset;
-+  }
-+
-+  @SuppressWarnings({"unchecked", "rawtypes"})
-+  static int mergeMessageField(
-+      Object msg, Schema schema, byte data, int position, int limit, Registers registers)
-+      throws IOException {
-     int length = dataposition++;
-     if (length < 0) {
-       position = decodeVarint32(length, data, position, registers);
-@@ -242,27 +265,28 @@ final class ArrayDecoders {
-     if (length < 0 || length > limit - position) {
-       throw InvalidProtocolBufferException.truncatedMessage();
-     }
--    Object result = schema.newInstance();
--    schema.mergeFrom(result, data, position, position + length, registers);
--    schema.makeImmutable(result);
--    registers.object1 = result;
-+    schema.mergeFrom(msg, data, position, position + length, registers);
-+    registers.object1 = msg;
-     return position + length;
-   }
- 
--  /** Decodes a group value. */
-   @SuppressWarnings({"unchecked", "rawtypes"})
--  static int decodeGroupField(
--      Schema schema, byte data, int position, int limit, int endGroup, Registers registers)
-+  static int mergeGroupField(
-+      Object msg,
-+      Schema schema,
-+      byte data,
-+      int position,
-+      int limit,
-+      int endGroup,
-+      Registers registers)
-       throws IOException {
-     // A group field must has a MessageSchema (the only other subclass of Schema is MessageSetSchema
-     // and it can't be used in group fields).
-     final MessageSchema messageSchema = (MessageSchema) schema;
--    Object result = messageSchema.newInstance();
-     // It's OK to directly use parseProto2Message since proto3 doesn't have group.
-     final int endPosition =
--        messageSchema.parseProto2Message(result, data, position, limit, endGroup, registers);
--    messageSchema.makeImmutable(result);
--    registers.object1 = result;
-+        messageSchema.parseProto2Message(msg, data, position, limit, endGroup, registers);
-+    registers.object1 = msg;
-     return endPosition;
-   }
- 
-@@ -847,26 +871,19 @@ final class ArrayDecoders {
-           break;
-         }
-         case ENUM:
--        {
--          IntArrayList list = new IntArrayList();
--          position = decodePackedVarint32List(data, position, list, registers);
--          UnknownFieldSetLite unknownFields = message.unknownFields;
--          if (unknownFields == UnknownFieldSetLite.getDefaultInstance()) {
--            unknownFields = null;
--          }
--          unknownFields =
--              SchemaUtil.filterUnknownEnumList(
--                  fieldNumber,
--                  list,
--                  extension.descriptor.getEnumType(),
--                  unknownFields,
--                  unknownFieldSchema);
--          if (unknownFields != null) {
--            message.unknownFields = unknownFields;
-+          {
-+            IntArrayList list = new IntArrayList();
-+            position = decodePackedVarint32List(data, position, list, registers);
-+            SchemaUtil.filterUnknownEnumList(
-+                message,
-+                fieldNumber,
-+                list,
-+                extension.descriptor.getEnumType(),
-+                null,
-+                unknownFieldSchema);
-+            extensions.setField(extension.descriptor, list);
-+            break;
-           }
--          extensions.setField(extension.descriptor, list);

_service:tar_scm:protobuf-all-3.14.0.tar.gz -> _service:tar_scm:protobuf-all-3.19.6.tar.gz Changed