aboutsummaryrefslogtreecommitdiff
path: root/c/enc/hash.h
diff options
context:
space:
mode:
authorEugene Kliuchnikov <eustas@google.com>2019-05-03 11:51:11 +0200
committerGitHub <noreply@github.com>2019-05-03 11:51:11 +0200
commit78e7bbc3c34bb85ecc9a912929e8b3b224973b05 (patch)
tree12acabbd74fbfe60dcbf217085dbbf03b6921af8 /c/enc/hash.h
parent4b2b2d4f83ffeaac7708e44409fe34896a01a278 (diff)
downloadbrotli-78e7bbc3c34bb85ecc9a912929e8b3b224973b05.zip
brotli-78e7bbc3c34bb85ecc9a912929e8b3b224973b05.tar.gz
brotli-78e7bbc3c34bb85ecc9a912929e8b3b224973b05.tar.bz2
Update (#753)
* fix executable mode of decode.js * explain clang-analyser about non-nullability * fix "dead assignment" * rename proguard.cfg -> proguard.pgcfg
Diffstat (limited to 'c/enc/hash.h')
-rw-r--r--c/enc/hash.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/c/enc/hash.h b/c/enc/hash.h
index 60fb5df..6362f69 100644
--- a/c/enc/hash.h
+++ b/c/enc/hash.h
@@ -426,7 +426,7 @@ static BROTLI_INLINE void HasherSetup(MemoryManager* m, Hasher* hasher,
ChooseHasher(params, &params->hasher);
alloc_size = HasherSize(params, one_shot, input_size);
hasher->common.extra = BROTLI_ALLOC(m, uint8_t, alloc_size);
- if (BROTLI_IS_OOM(m)) return;
+ if (BROTLI_IS_OOM(m) || BROTLI_IS_NULL(hasher->common.extra)) return;
hasher->common.params = params->hasher;
switch (hasher->common.params.type) {
#define INITIALIZE_(N) \