diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:38:10 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:38:10 +0000 |
| commit | 949aa4b8a6b410d2c9e30a1551dd57cf51962ef1 (patch) | |
| tree | d5dd35e02c3b6767a037533b50136a6034907d1b | |
| parent | cf804dc52016026609f47a12c73c3e7ed42bdd51 (diff) | |
| parent | ae98dded0afe43f2a4ddd0cc01b5d878cc416920 (diff) | |
| download | dng_sdk-android12-mainline-tzdata3-release.tar.gz | |
Snap for 8730993 from ae98dded0afe43f2a4ddd0cc01b5d878cc416920 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: Ia308eff1fb63ce6a4aac1c72dd693b6570c96b04
| -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, 4 insertions, 8 deletions
@@ -133,6 +133,7 @@ cc_defaults { rtti: true, cppflags: ["-fexceptions"], + clang: true, sanitize: { misc_undefined: [ "unsigned-integer-overflow", @@ -141,7 +142,7 @@ cc_defaults { }, } -cc_library { +cc_library{ name: "libdng_sdk", host_supported: true, vendor_available: true, @@ -155,7 +156,7 @@ cc_library { ], target: { - host_linux: { + linux_glibc: { static_libs: ["libcompiler_rt-extras"], }, darwin: { @@ -2,6 +2,5 @@ # 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 e3dcecf..26e2fa6 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/Android.bp @@ -36,7 +36,4 @@ 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 66c5ebf..b229dc4 100644 --- a/source/dng_safe_arithmetic.h +++ b/source/dng_safe_arithmetic.h @@ -20,7 +20,6 @@ #ifndef __dng_safe_arithmetic__ #define __dng_safe_arithmetic__ -#include <climits> #include <cstddef> #include <cstdint> #include <limits> @@ -113,7 +112,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 LONG_MAX == INT64_MAX +#if (__WORDSIZE == 64) && !defined(__APPLE__) if (__builtin_smull_overflow(arg1, arg2, &result)) { #else if (__builtin_smulll_overflow(arg1, arg2, &result)) { |