update zlib to 1.2.5

"Version 1.2.5 fixes bugs in gzseek() and gzeof() that were present in version 1.2.4 (March 2010). All users are encouraged to upgrade immediately."
...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7076 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2011-02-05 05:29:27 +00:00
parent 0841be0fea
commit 2d3a7b4155
27 changed files with 2117 additions and 1477 deletions

View File

@ -1255,7 +1255,7 @@ const Bytef *dictionary;
uInt dictLength;
{
struct inflate_state FAR *state;
unsigned long dictid;
unsigned long id;
/* check state */
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
@ -1265,9 +1265,9 @@ uInt dictLength;
/* check for correct dictionary id */
if (state->mode == DICT) {
dictid = adler32(0L, Z_NULL, 0);
dictid = adler32(dictid, dictionary, dictLength);
if (dictid != state->check)
id = adler32(0L, Z_NULL, 0);
id = adler32(id, dictionary, dictLength);
if (id != state->check)
return Z_DATA_ERROR;
}