Bump upb version to pull in windows/python bazel fix

PiperOrigin-RevId: 506510613
pull/11764/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent d923d6e968
commit 4a4862b394
  1. 9
      php/ext/google/protobuf/php-upb.c
  2. 4
      protobuf_deps.bzl
  3. 9
      ruby/ext/google/protobuf_c/ruby-upb.c

@ -6811,7 +6811,7 @@ static void upb_MtDecoder_ValidateEntryField(upb_MtDecoder* d,
name, expected_num, (int)f->number);
}
if (upb_IsRepeatedOrMap(f) || f->presence < 0) {
if (upb_IsRepeatedOrMap(f)) {
upb_MtDecoder_ErrorFormat(
d, "map %s cannot be repeated or map, or be in oneof", name);
}
@ -6841,6 +6841,13 @@ static void upb_MtDecoder_ParseMap(upb_MtDecoder* d, const char* data,
UPB_UNREACHABLE();
}
upb_LayoutItem* end = UPB_PTRADD(d->vec.data, d->vec.size);
for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
if (item->type == kUpb_LayoutItemType_OneofCase) {
upb_MtDecoder_ErrorFormat(d, "Map entry cannot have oneof");
}
}
upb_MtDecoder_ValidateEntryField(d, &d->table->fields[0], 1);
upb_MtDecoder_ValidateEntryField(d, &d->table->fields[1], 2);

@ -149,7 +149,7 @@ def protobuf_deps():
_github_archive(
name = "upb",
repo = "https://github.com/protocolbuffers/upb",
commit = "702d95891d70547397e9d45edc00cd7c36f476e1",
sha256 = "27f0b1d48c58ffd03081516ba6cdf163e93f74376ba13b18a92d80631fb94bba",
commit = "84a3fd2d2d943c8ff37f09feadb1dd3f60f954ee",
sha256 = "5c144471b9d92250e77710376251a6929e47b49eea50b8f380e759a9447fb60b",
patches = ["@com_google_protobuf//build_defs:upb.patch"],
)

@ -6448,7 +6448,7 @@ static void upb_MtDecoder_ValidateEntryField(upb_MtDecoder* d,
name, expected_num, (int)f->number);
}
if (upb_IsRepeatedOrMap(f) || f->presence < 0) {
if (upb_IsRepeatedOrMap(f)) {
upb_MtDecoder_ErrorFormat(
d, "map %s cannot be repeated or map, or be in oneof", name);
}
@ -6478,6 +6478,13 @@ static void upb_MtDecoder_ParseMap(upb_MtDecoder* d, const char* data,
UPB_UNREACHABLE();
}
upb_LayoutItem* end = UPB_PTRADD(d->vec.data, d->vec.size);
for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
if (item->type == kUpb_LayoutItemType_OneofCase) {
upb_MtDecoder_ErrorFormat(d, "Map entry cannot have oneof");
}
}
upb_MtDecoder_ValidateEntryField(d, &d->table->fields[0], 1);
upb_MtDecoder_ValidateEntryField(d, &d->table->fields[1], 2);

Loading…
Cancel
Save