diff options
author | jimw@mysql.com <> | 2005-07-11 10:37:21 -0700 |
---|---|---|
committer | jimw@mysql.com <> | 2005-07-11 10:37:21 -0700 |
commit | 7ae4a6043c074235fc944e7fba25b903d5a17bb8 (patch) | |
tree | 31e70e44b5c97fd777409554bbbf916ec6bce6f2 /zlib | |
parent | ccae663ec0d0198e00cbf69bb9a2bef2652dcc1f (diff) | |
download | mariadb-git-7ae4a6043c074235fc944e7fba25b903d5a17bb8.tar.gz |
Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)
Diffstat (limited to 'zlib')
-rw-r--r-- | zlib/inftrees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib/inftrees.c b/zlib/inftrees.c index 8a896b28793..509461d9273 100644 --- a/zlib/inftrees.c +++ b/zlib/inftrees.c @@ -134,7 +134,7 @@ unsigned short FAR *work; left -= count[len]; if (left < 0) return -1; /* over-subscribed */ } - if (left > 0 && (type == CODES || (codes - count[0] != 1))) + if (left > 0 && (type == CODES || max != 1)) return -1; /* incomplete set */ /* generate offsets into symbol table for each length for sorting */ |