summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-07-11 10:37:21 -0700
committerunknown <jimw@mysql.com>2005-07-11 10:37:21 -0700
commitb1b37094d9103c39071f6d414ad75dbcf98f495d (patch)
tree31e70e44b5c97fd777409554bbbf916ec6bce6f2 /zlib
parent1f58b8f96eeb85edb74e206137ae539426ba4de6 (diff)
downloadmariadb-git-b1b37094d9103c39071f6d414ad75dbcf98f495d.tar.gz
Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)
zlib/inftrees.c: Apply security patch for CAN-2005-2096
Diffstat (limited to 'zlib')
-rw-r--r--zlib/inftrees.c2
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 */