Merge branch 'main' into python-tests

pull/13171/head
Joshua Haberman 3 years ago
commit 2244914ac1
  1. 7
      bazel/workspace_deps.bzl
  2. 3
      upb/decode_fast.c

@ -13,10 +13,11 @@ def upb_deps():
maybe( maybe(
http_archive, http_archive,
name = "com_google_protobuf", name = "com_google_protobuf",
sha256 = "b10bf4e2d1a7586f54e64a5d9e7837e5188fc75ae69e36f215eb01def4f9721b", sha256 = "87407cd28e7a9c95d9f61a098a53cf031109d451a7763e7dd1253abf8b4df422",
strip_prefix = "protobuf-3.15.3", strip_prefix = "protobuf-3.19.1",
urls = [ urls = [
"https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz", "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.1.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.19.1.tar.gz",
], ],
) )

@ -800,6 +800,9 @@ static void fastdecode_docopy(upb_decstate *d, const char *ptr, uint32_t size,
UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS); \ UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS); \
\ \
longstr: \ longstr: \
if (card == CARD_r) { \
fastdecode_commitarr(dst + 1, &farr, sizeof(upb_strview)); \
} \
ptr--; \ ptr--; \
if (validate_utf8) { \ if (validate_utf8) { \
UPB_MUSTTAIL return fastdecode_longstring_utf8(d, ptr, msg, table, \ UPB_MUSTTAIL return fastdecode_longstring_utf8(d, ptr, msg, table, \

Loading…
Cancel
Save