From 82a7cf6205244f5f641ae6b8138c3646bd2b65bc Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 11 Nov 2024 20:06:29 +0000 Subject: [PATCH] Auto-generate files after cl/695429913 --- .../Reflection/FeatureSetDescriptor.g.cs | 17 ++++++++++++++++ php/ext/google/protobuf/php-upb.c | 20 ++++++++++--------- ruby/ext/google/protobuf_c/ruby-upb.c | 20 ++++++++++--------- 3 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs diff --git a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs b/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs new file mode 100644 index 0000000000..208ce1fcb6 --- /dev/null +++ b/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs @@ -0,0 +1,17 @@ +#region Copyright notice and license +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd +#endregion + +namespace Google.Protobuf.Reflection; + +internal sealed partial class FeatureSetDescriptor +{ + // Canonical serialized form of the edition defaults, generated by embed_edition_defaults. + private const string DefaultsBase64 = + "ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH"; +} diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 6db0b4d9ef..0acb5805e0 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -3900,17 +3900,19 @@ void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) { bool upb_Message_NextUnknown(const upb_Message* msg, upb_StringView* data, uintptr_t* iter) { - upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg); + const upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg); if (in && *iter == kUpb_Message_UnknownBegin) { - data->size = in->unknown_end - message_overhead; - data->data = (char*)(in + 1); - (*iter)++; - return true; - } else { - data->size = 0; - data->data = NULL; - return false; + size_t len = in->unknown_end - message_overhead; + if (len != 0) { + data->size = len; + data->data = (const char*)(in + 1); + (*iter)++; + return true; + } } + data->size = 0; + data->data = NULL; + return false; } const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) { diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index cfa3a39ac7..7d4db7e4fa 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -3900,17 +3900,19 @@ void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) { bool upb_Message_NextUnknown(const upb_Message* msg, upb_StringView* data, uintptr_t* iter) { - upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg); + const upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg); if (in && *iter == kUpb_Message_UnknownBegin) { - data->size = in->unknown_end - message_overhead; - data->data = (char*)(in + 1); - (*iter)++; - return true; - } else { - data->size = 0; - data->data = NULL; - return false; + size_t len = in->unknown_end - message_overhead; + if (len != 0) { + data->size = len; + data->data = (const char*)(in + 1); + (*iter)++; + return true; + } } + data->size = 0; + data->data = NULL; + return false; } const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {