Commit 000f2403 authored by unknown's avatar unknown
Browse files

Combining zlib security fixes for version 4.1.13a: 

Fix for CAN-2005-1849 from zlib-1.2.3
   (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
Ensure static linking takes the bundled libraries
   (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )
Version number change.


configure.in:
  Update the version number.
support-files/mysql.spec.sh:
  - build against the bundled zlib, when linking statically
  (originally:  2005/07/27 16:42:08+02:00 lenz@mysql.com +1 -0 )
zlib/inftrees.h:
  - applied another security fix to resolve CAN-2005-1849, taken from the 1.2.3 zlib sources
  (CAN-2005-1849)
  (originally:  2005/07/27 14:54:58+02:00 lenz@mysql.com +5 -5 )
parent 130cd50d

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.13)

AM_INIT_AUTOMAKE(mysql, 4.1.13a)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

support-files/mysql.spec.sh

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ BuildMySQL "--disable-shared \ 
%if %{STATIC_BUILD}

		--with-mysqld-ldflags='-all-static' \

		--with-client-ldflags='-all-static' \

		--with-zlib-dir=bundled \

		$USE_OTHER_LIBC_DIR \

%endif

		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \

zlib/inftrees.h

+5 −5
Original line number Diff line number Diff line 
/* inftrees.h -- header to use inftrees.c

 * Copyright (C) 1995-2003 Mark Adler

 * Copyright (C) 1995-2005 Mark Adler

 * For conditions of distribution and use, see copyright notice in zlib.h

 */
@@ -36,12 +36,12 @@ typedef struct { 
 */



/* Maximum size of dynamic tree.  The maximum found in a long but non-

   exhaustive search was 1004 code structures (850 for length/literals

   and 154 for distances, the latter actually the result of an

   exhaustive search was 1444 code structures (852 for length/literals

   and 592 for distances, the latter actually the result of an

   exhaustive search).  The true maximum is not known, but the value

   below is more than safe. */

#define ENOUGH 1440

#define MAXD 154

#define ENOUGH 2048

#define MAXD 592



/* Type of code to build for inftable() */

typedef enum {