diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:06:48 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:06:48 +0000 |
| commit | fed1bf33f68ea68f57a13b5c03bab26bd537a37b (patch) | |
| tree | 121ebb9b8ea23c8e1770d0f46064d58d0d268ad4 | |
| parent | ae98dded0afe43f2a4ddd0cc01b5d878cc416920 (diff) | |
| parent | 0e9959434bdb8c465a30f10487e2069789e3ef49 (diff) | |
| download | dng_sdk-android13-mainline-networking-release.tar.gz | |
Snap for 8570526 from 0e9959434bdb8c465a30f10487e2069789e3ef49 to mainline-networking-releaseaml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010android13-mainline-networking-release
Change-Id: I1ad1032b342622b24f0489a866555b23432ca8a5
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | METADATA | 1 | ||||
| -rw-r--r-- | fuzzer/Android.bp | 3 | ||||
| -rw-r--r-- | source/dng_safe_arithmetic.h | 3 |
4 files changed, 8 insertions, 4 deletions
@@ -133,7 +133,6 @@ cc_defaults { rtti: true, cppflags: ["-fexceptions"], - clang: true, sanitize: { misc_undefined: [ "unsigned-integer-overflow", @@ -142,7 +141,7 @@ cc_defaults { }, } -cc_library{ +cc_library { name: "libdng_sdk", host_supported: true, vendor_available: true, @@ -156,7 +155,7 @@ cc_library{ ], target: { - linux_glibc: { + host_linux: { static_libs: ["libcompiler_rt-extras"], }, darwin: { @@ -2,5 +2,6 @@ # CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE # DEPENDING ON IT IN YOUR PROJECT. *** third_party { + license_note: "Adobe's DNG SDK License Agreement" license_type: BY_EXCEPTION_ONLY } diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp index 26e2fa6..e3dcecf 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/Android.bp @@ -36,4 +36,7 @@ cc_fuzz { "seeds/CVE_2020_9589/original.dng", "seeds/CVE_2020_9589/poc.dng", ], + fuzz_config: { + cc: ["android-security-assurance-redteam@google.com"], + }, } diff --git a/source/dng_safe_arithmetic.h b/source/dng_safe_arithmetic.h index b229dc4..66c5ebf 100644 --- a/source/dng_safe_arithmetic.h +++ b/source/dng_safe_arithmetic.h @@ -20,6 +20,7 @@ #ifndef __dng_safe_arithmetic__ #define __dng_safe_arithmetic__ +#include <climits> #include <cstddef> #include <cstdint> #include <limits> @@ -112,7 +113,7 @@ std::int64_t SafeInt64MultSlow(std::int64_t arg1, std::int64_t arg2); #if __has_builtin(__builtin_smull_overflow) inline std::int64_t SafeInt64MultByClang(std::int64_t arg1, std::int64_t arg2) { std::int64_t result; -#if (__WORDSIZE == 64) && !defined(__APPLE__) +#if LONG_MAX == INT64_MAX if (__builtin_smull_overflow(arg1, arg2, &result)) { #else if (__builtin_smulll_overflow(arg1, arg2, &result)) { |