Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aad724d authored by Tim Yamin's avatar Tim Yamin Committed by Linus Torvalds
Browse files

[PATCH] Update in-kernel zlib routines 

These bugs have been fixed in the standard zlib for a while.

See for example

 a) http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html
 b) http://bugs.gentoo.org/show_bug.cgi?id=94584



Signed-off-by: default avatarTim Yamin <plasmaroo@gentoo.org>
Signed-off-by: default avatarTavis Ormandy <taviso@gentoo.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 00a5dfdb

arch/ppc64/boot/zlib.c

+2 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ local int huft_build( 
  {

    *t = (inflate_huft *)Z_NULL;

    *m = 0;

    return Z_OK;

    return Z_DATA_ERROR;

  }
@@ -1351,6 +1351,7 @@ local int huft_build( 
    if ((j = *p++) != 0)

      v[x[j]++] = i;

  } while (++i < n);

  n = x[g];			/* set n to length of v */





  /* Generate the Huffman codes and for each, make the table entries */

lib/inflate.c

+9 −7
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ DEBG("huft1 "); 
  {

    *t = (struct huft *)NULL;

    *m = 0;

    return 0;

    return 2;

  }



DEBG("huft2 ");
@@ -374,6 +374,7 @@ DEBG("huft5 "); 
    if ((j = *p++) != 0)

      v[x[j]++] = i;

  } while (++i < n);

  n = x[g];                   /* set n to length of v */



DEBG("h6 ");
@@ -410,6 +411,7 @@ DEBG1("1 "); 
DEBG1("2 ");

          f -= a + 1;           /* deduct codes from patterns left */

          xp = c + k;

          if (j < z)

            while (++j < z)       /* try smaller tables up to z bits */

            {

              if ((f <<= 1) <= *++xp)

lib/zlib_inflate/inftrees.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int huft_build( 
  {

    *t = NULL;

    *m = 0;

    return Z_OK;

    return Z_DATA_ERROR;

  }