aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-16Snap for 8953554 from 79a0779064d295353008f34f59120bb49ff0950b to ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Android Build Coastguard Worker
mainline-tzdata4-release Change-Id: I685d513cdb971beaaca78455b8c8c2ef7e4b121c
2022-06-02Make bool and null easier to use. am: 4268a60b05Shawn Willden
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/18638884 Change-Id: Id40bef52dab22e03688269df9faddda03443d264 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Make bool and null easier to use.android13-devShawn Willden
(Cherry pick from aosp/2032527) Bug: 219076736 Test: cppbor_test_external Change-Id: I7d11b0853042b7e6701b5d8ff9bfead9e8436834
2022-03-24Fixing minor bugs in libcppbor. am: 61d9bff960 am: b3cd49bcd1 am: 50685cc010 ↵Vikram Gaur
am: b8b6bd82db Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2037164 Change-Id: I50e56232b94b2f2438ab4f0dfd57b66ea9210895
2022-03-24Fixing minor bugs in libcppbor. am: 61d9bff960 am: b3cd49bcd1 am: 50685cc010Vikram Gaur
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2037164 Change-Id: I104cf2220c5f4301756a3f118a13fbf48ff65495
2022-03-24Fixing minor bugs in libcppbor. am: 61d9bff960 am: b3cd49bcd1Vikram Gaur
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2037164 Change-Id: Ief33e58c6226b77471fd0f23caea6dedc737920f
2022-03-24Fixing minor bugs in libcppbor. am: 61d9bff960Vikram Gaur
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2037164 Change-Id: I411122ef953ca129802e2f6f244c509d94bbef57
2022-03-23Fixing minor bugs in libcppbor.Vikram Gaur
Disambiguated references to UINT, BOOLEAN Undefined TRUE/FALSE so that we can refer to the data types in CBOR. Added required headers. Change-Id: I762fc9bc18fcb79e6f94bf1871d6ffe5c5790997 Test: Existing test cases pass.
2022-03-19Fixed minor bugs in libcppbor. am: 237ccfe4c3 am: 2d799b0dff am: b236eac890 ↵Vikram Gaur
am: 5e7d047117 Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2032574 Change-Id: Ie0b083d9cbb438ddafd0c1956748da48b4a8261e
2022-03-19Fixed minor bugs in libcppbor. am: 237ccfe4c3 am: 2d799b0dff am: b236eac890Vikram Gaur
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2032574 Change-Id: I5f4759ff8e63252e66b9ee128227b8a408e080f3
2022-03-19Fixed minor bugs in libcppbor. am: 237ccfe4c3 am: 2d799b0dffVikram Gaur
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2032574 Change-Id: I2610e139bed4c28d4e577677d8b674580ded6933
2022-03-19Fixed minor bugs in libcppbor. am: 237ccfe4c3Vikram Gaur
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2032574 Change-Id: I901a647321a24140a3d2f2f6f83dc07ecd65686d
2022-03-18Fixed minor bugs in libcppbor.Vikram Gaur
Fixed a dangling pointer issue in ViewBstr roundtrip test. Used explicit template instantiation for basic_string_view in tests instead of relying on template argument deduction. Bug: 224815962 Change-Id: I21967e9bb0ca12653c3f4a0c1bb7a99441894dc4 Test: Corrected unit test. Existing test cases still pass.
2022-03-09[automerger skipped] Merge Android 12L am: 273776ac27 -s ours am: be0b5adaec ↵Xin Li
-s ours am: 182cc59382 -s ours am: b30b6483aa -s ours am skip reason: Merged-In Ib1552db7927c8f588485866121a5af3cfc159d79 with SHA-1 3abc4c30f4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2013250 Change-Id: I3afe7d9476f5550262633ce9644128e634e1a4ae
2022-03-09[automerger skipped] Merge Android 12L am: 273776ac27 -s ours am: be0b5adaec ↵Xin Li
-s ours am: 182cc59382 -s ours am skip reason: Merged-In Ib1552db7927c8f588485866121a5af3cfc159d79 with SHA-1 3abc4c30f4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2013250 Change-Id: I52ed8102712b6fc6f4ef74feb19b78f72856272f
2022-03-08[automerger skipped] Merge Android 12L am: 273776ac27 -s ours am: be0b5adaec ↵Xin Li
-s ours am skip reason: Merged-In Ib1552db7927c8f588485866121a5af3cfc159d79 with SHA-1 3abc4c30f4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2013250 Change-Id: I5a6a142120df936dc31ff8e902d30cb0308e3ec4
2022-03-08[automerger skipped] Merge Android 12L am: 273776ac27 -s oursXin Li
am skip reason: Merged-In Ib1552db7927c8f588485866121a5af3cfc159d79 with SHA-1 3abc4c30f4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/2013250 Change-Id: I204cb06fd0ff72071175cdbba5408c3d826ba27d
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: Ib1552db7927c8f588485866121a5af3cfc159d79 Change-Id: Icfc355f7275e9fcd2550fceac11c6f07aad59217
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
3abc4c30f4 -s ours am: 1711b39812 -s ours am skip reason: Merged-In If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 with SHA-1 8f4908840c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/16844541 Change-Id: Ibdbe7696813bb4c92e3ea8abd78715df0255c321
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
3abc4c30f4 -s ours am skip reason: Merged-In If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 with SHA-1 8f4908840c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/16844541 Change-Id: I1baea57ac95c1964facdb5c685f1843f8c7c993b
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 Change-Id: Ib1552db7927c8f588485866121a5af3cfc159d79
2022-01-21[automerger skipped] Add input validation for 'parseRecursively' method. am: ↵Hasini Gunasinghe
31258214ed am: 66189c349a am: aca96f479b -s ours am: 38d7bb16bd -s ours am skip reason: Merged-In If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 with SHA-1 8f4908840c is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1956719 Change-Id: Ibb0f14a6180750c24531054b64a81691a8a72f01
2022-01-21[automerger skipped] Add input validation for 'parseRecursively' method. am: ↵Hasini Gunasinghe
31258214ed am: 66189c349a am: aca96f479b -s ours am skip reason: Merged-In If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 with SHA-1 8f4908840c is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1956719 Change-Id: Ied7274133b54a11486bd1c991c25cd9f38a7fb63
2022-01-21Add input validation for 'parseRecursively' method. am: 31258214ed am: ↵Hasini Gunasinghe
66189c349a Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1956719 Change-Id: I6f88a716b9796c00ff220711c2bebe93e651fee0
2022-01-21Add input validation for 'parseRecursively' method. am: 31258214edHasini Gunasinghe
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1956719 Change-Id: I4717598cbad0fc2dda169f25e25756d09f4820ac
2022-01-21Add input validation for 'parseRecursively' method.android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Hasini Gunasinghe
Bug: 192743373 Test: To be verified with fuzzer test case. Merged-In: If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 Change-Id: I0b553d58863aaa85004a7bc576fb524df31af44a
2022-01-12Add input validation for 'parseRecursively' method. am: 8f4908840c am: ↵Hasini Gunasinghe
2c9da42d4c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/16607343 Change-Id: Icc62947c774d227e6637970abe88a66b200cec6a
2022-01-12Add input validation for 'parseRecursively' method. am: 8f4908840cHasini Gunasinghe
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/16607343 Change-Id: Ifd1fcd9db93e245451b43e0e86ba7d0c0a3206c5
2022-01-12Add input validation for 'parseRecursively' method.android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseHasini Gunasinghe
Bug: 192743373 Test: To be verified with fuzzer test case. Change-Id: If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 ↵Xin Li
-s ours am: a1b9cc16db -s ours am: 9424732f83 -s ours am: 872b0aa4fc -s ours am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: Ic67cecea83d57da7e6043f8b2998f2d285c1979c
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 ↵Xin Li
-s ours am: a1b9cc16db -s ours am: 9424732f83 -s ours am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: I5fe9edba3dab0aef045cee149cce800806a45f4d
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 ↵Xin Li
-s ours am: a1b9cc16db -s ours am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: Id3d0415a8f4d3eacb9e4f2a65758fa13c34aa916
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 ↵Xin Li
-s ours am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: Ie8842b5695565100b8ae992672a63ee5689e5467
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s oursXin Li
am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: I9c4068309bd2e3825f7125146cbbcdbe212b5aaf
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I924b3ddd6fd350227c02d9a15857de5102311a32 Change-Id: I4da905f9e98fe1fe675a24a859939a9fcdcdde73
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
3d50375056 -s ours am: 3a4281c96e -s ours am: c29722361a -s ours am: 97f7c36ea8 -s ours am skip reason: Merged-In Ia7a8b4e355aa9086135422fd1e45996ab1731108 with SHA-1 d7ace4469d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15571663 Change-Id: I6ee2d4e200f4504a7ab8493ca9c8e6ec7d15193e
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
3d50375056 -s ours am: 3a4281c96e -s ours am: c29722361a -s ours am skip reason: Merged-In Ia7a8b4e355aa9086135422fd1e45996ab1731108 with SHA-1 d7ace4469d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15571663 Change-Id: I97eda453f4f3b929bf834888a466a32fe0dbd579
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
3d50375056 -s ours am: 3a4281c96e -s ours am skip reason: Merged-In Ia7a8b4e355aa9086135422fd1e45996ab1731108 with SHA-1 d7ace4469d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15571663 Change-Id: I177beffffd68046ae63d815f7d0938e7bd6dfeee
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
3d50375056 -s ours am skip reason: Merged-In Ia7a8b4e355aa9086135422fd1e45996ab1731108 with SHA-1 d7ace4469d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15571663 Change-Id: I8f90e9485dd89c62154f3c6e1acbbfbf1e54b606
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ia7a8b4e355aa9086135422fd1e45996ab1731108 Change-Id: I924b3ddd6fd350227c02d9a15857de5102311a32
2021-07-09Don't allow implicit conversion to Array am: b0c9795e04 am: 1b23995a6b am: ↵Seth Moore
d7ace4469d am: a3bc7d7b21 Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1753047 Change-Id: Id76ace8e4758a195064a284c0061d1a30105eb60
2021-07-09Don't allow implicit conversion to Array am: b0c9795e04 am: 1b23995a6b am: ↵Seth Moore
d7ace4469d Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1753047 Change-Id: I0b58b4ca7b9f4c86c269201101352e9a9410ff5b
2021-07-09Don't allow implicit conversion to Array am: b0c9795e04 am: 1b23995a6bSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1753047 Change-Id: Ia7a8b4e355aa9086135422fd1e45996ab1731108
2021-07-09Don't allow implicit conversion to Array am: b0c9795e04Seth Moore
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1753047 Change-Id: I3b772f0a5e1d8c2ece190bcc6bc2bf41f499f99f
2021-06-30Don't allow implicit conversion to Arrayandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Seth Moore
The variadic Array constructor would implicitly make an Array object from a single input that is convertable to an Item. This leads to surprising behaviors wherein Arrays could be created unintentionally. Fix this by making the variadic constructor only work for more than one argument. Add an additional, single-item constructor that is explicit. Bug: 191778240 Test: cppbor_host_test_external Change-Id: Ifadc6d3137ee285a81076a4125b6053f1d7c21c4
2021-06-30Check for integer overflow in cppbor::parseRecursively. am: 4907264bdc am: ↵Shawn Willden
7301ee25d2 am: 26de8b432a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15110385 Change-Id: I130af7f8485d51c6e5781be6925635e586cce651
2021-06-30Check for integer overflow in cppbor::parseRecursively. am: 4907264bdc am: ↵Shawn Willden
8ca1ad02f8 am: 9821e3c1ce Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15110385 Change-Id: Ia5d1747f31463d0eba56f5942f274ae5bcd9ac5f
2021-06-30Check for integer overflow in cppbor::parseRecursively. am: 4907264bdc am: ↵Shawn Willden
7301ee25d2 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15110385 Change-Id: I80fc60e00f58504181480b34c0796cb3f6b39789
2021-06-30Check for integer overflow in cppbor::parseRecursively. am: 4907264bdc am: ↵Shawn Willden
8ca1ad02f8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15110385 Change-Id: Ibdc7d6fa7ca11d69f401d583a1a3448c4ebbe1d2
2021-06-30Check for integer overflow in cppbor::parseRecursively. am: 4907264bdc am: ↵Shawn Willden
3edbac8168 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15110385 Change-Id: Ife464e1861d560cf49f164f9899fdd770c4f906f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 00:59:46 +0000