diff options
| author | Brian Carlstrom <bdc@google.com> | 2016-09-21 18:06:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-21 18:06:57 +0000 |
| commit | b8a17aa3bcff3fba801f4a401af4abc37b14ac9d (patch) | |
| tree | 20433f5877517be193e526bdb06ab96737235587 | |
| parent | 41fc89d385252e4ebae0ff6f7648d921cb875798 (diff) | |
| parent | 264935ecd6677561bf41c5a9848110a70c83202b (diff) | |
| download | expat-b8a17aa3bcff3fba801f4a401af4abc37b14ac9d.tar.gz | |
Fix cast from pointer to integer of different size am: 8caa27c260
am: 264935ecd6
Change-Id: Ia1fc2f749cc873560bcf56c41e01334986bd1c7b
| -rw-r--r-- | lib/xmlparse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/xmlparse.c b/lib/xmlparse.c index e12853c6..0655e080 100644 --- a/lib/xmlparse.c +++ b/lib/xmlparse.c @@ -3,6 +3,7 @@ */ #include <stddef.h> +#include <stdint.h> #include <string.h> /* memset(), memcpy() */ #include <assert.h> #include <limits.h> /* UINT_MAX */ @@ -722,7 +723,7 @@ generate_hash_secret_salt(XML_Parser parser) /* Process ID is 0 bits entropy if attacker has local access * XML_Parser address is few bits of entropy if attacker has local access */ const unsigned long entropy = - gather_time_entropy() ^ getpid() ^ (unsigned long)parser; + gather_time_entropy() ^ getpid() ^ (uintptr_t)parser; /* Factors are 2^31-1 and 2^61-1 (Mersenne primes M31 and M61) */ if (sizeof(unsigned long) == 4) { |