From: Date: July 11 2005 7:37pm
Subject: bk commit into 4.1 tree (jimw:1.2335) BUG#11844
List-Archive: http://lists.mysql.com/internals/26901
X-Bug: 11844
Message-Id: <20050711173725.6532FA8C22@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2335 05/07/11 10:37:21 jimw@stripped +1 -0
  Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)

  zlib/inftrees.c
    1.4 05/07/11 09:55:03 jimw@stripped +1 -1
    Apply security patch for CAN-2005-2096

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-11844

--- 1.3/zlib/inftrees.c	2005-03-23 12:08:04 -08:00
+++ 1.4/zlib/inftrees.c	2005-07-11 09:55:03 -07:00
@@ -134,7 +134,7 @@
         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 */