Google Git
Sign in
chromium / chromiumos / platform / cbor / refs/heads/stabilize-15857.B
commit22ce639d21a6607f23d0c1893a12550613164a83[log] [tgz]
authorRyo Hashimoto <[email protected]>Thu Feb 08 12:11:39 2024
committerChromeos LUCI <[email protected]>Tue Feb 13 03:49:13 2024
treeee9f176bc87bfbbd7ff3ef3ac89eddd5e6dc9611
parentbd1416be85fc5c317a2e6171be066ed98841e643 [diff]
Use base::checked_cast to convert uint64_t to size_t

Do the same thing as http://crrev.com/c/5213529

BUG=b:324173685
TEST=cros_run_unit_tests --board=hana --packages cbor

Change-Id: I22b877d314f6f0af9b67d7fb87211311bcdb5a44
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/5274069
Reviewed-by: Tom Hughes <[email protected]>
Commit-Queue: Ryo Hashimoto <[email protected]>
Tested-by: Ryo Hashimoto <[email protected]>
1 file changed
tree: ee9f176bc87bfbbd7ff3ef3ac89eddd5e6dc9611
  1. reader_fuzzer_corpus/
  2. BUILD.gn
  3. cbor_export.h
  4. constants.h
  5. diagnostic_writer.cc
  6. diagnostic_writer.h
  7. diagnostic_writer_unittest.cc
  8. DIR_METADATA
  9. OWNERS
  10. reader.cc
  11. reader.h
  12. reader_fuzzer.cc
  13. reader_unittest.cc
  14. README.md
  15. values.cc
  16. values.h
  17. values_unittest.cc
  18. writer.cc
  19. writer.h
  20. writer_unittest.cc
README.md

cbor: Concise Binary Object Representation

This library is a partial implementation of the RFC 7049 Concise Binary Object Representation standard.

The source code was fetched from chromium/src in order to avoid code duplication.

The cros/upstream/main branch is a mirror of the components/cbor directory from upstream. It is automatically updated to reflect the latest changes in upstream.

How to update the source

To pull in updates from chromium/src, do the following:

  • git remote update

  • git checkout -b main cros/main

  • git merge cros/upstream/main

    • Expect merge conflicts, because of the difference in header paths.
    • OWNERS should use the version from main.
    • BUILD.gn should mostly use the version from main, unless the upstream changes the files to be built.
    • The #include paths should use the version from main (without “components/”). This should be the majority of the merge conflicts.
    • In the commit message of the merge, list the commits from upstream that are merged.
    • If you need to do make changes to the merged commits (outside of conflicts), do that work in separate commits. For example, if you need to revert commits, use git revert after committing the merge commit. This preserves the history and makes it clear why a change is being reverted rather than quietly changing it in the merge commit.
    • Check the changes introduced by your merge by doing a diff against the commit before the merge. The difference should be the same as the changes in the upstream.

  • Push the resulting merge commit with:

    (chroot) $ git push HEAD:refs/for/main