Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed "Overflow" back to "overflow".
[rsync/rsync.git]
/
zlib
/
infblock.c
diff --git
a/zlib/infblock.c
b/zlib/infblock.c
index
96a7a26
..
38f90fc
100644
(file)
--- a/
zlib/infblock.c
+++ b/
zlib/infblock.c
@@
-176,7
+176,7
@@
int r;
break;
case 3: /* illegal */
DUMPBITS(3)
break;
case 3: /* illegal */
DUMPBITS(3)
- s->mode =
z
BAD;
+ s->mode = BAD;
z->msg = (char*)"invalid block type";
r = Z_DATA_ERROR;
LEAVE
z->msg = (char*)"invalid block type";
r = Z_DATA_ERROR;
LEAVE
@@
-186,7
+186,7
@@
int r;
NEEDBITS(32)
if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
{
NEEDBITS(32)
if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
{
- s->mode =
z
BAD;
+ s->mode = BAD;
z->msg = (char*)"invalid stored block lengths";
r = Z_DATA_ERROR;
LEAVE
z->msg = (char*)"invalid stored block lengths";
r = Z_DATA_ERROR;
LEAVE
@@
-219,7
+219,7
@@
int r;
#ifndef PKZIP_BUG_WORKAROUND
if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
{
#ifndef PKZIP_BUG_WORKAROUND
if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
{
- s->mode =
z
BAD;
+ s->mode = BAD;
z->msg = (char*)"too many length or distance symbols";
r = Z_DATA_ERROR;
LEAVE
z->msg = (char*)"too many length or distance symbols";
r = Z_DATA_ERROR;
LEAVE
@@
-251,10
+251,10
@@
int r;
{
r = t;
if (r == Z_DATA_ERROR)
{
r = t;
if (r == Z_DATA_ERROR)
-
{
-
ZFREE(z, s->sub.trees.blens);
-
s->mode = z
BAD;
-
}
+ {
+ ZFREE(z, s->sub.trees.blens);
+
s->mode =
BAD;
+ }
LEAVE
}
s->sub.trees.index = 0;
LEAVE
}
s->sub.trees.index = 0;
@@
-291,7
+291,7
@@
int r;
(c == 16 && i < 1))
{
ZFREE(z, s->sub.trees.blens);
(c == 16 && i < 1))
{
ZFREE(z, s->sub.trees.blens);
- s->mode =
z
BAD;
+ s->mode = BAD;
z->msg = (char*)"invalid bit length repeat";
r = Z_DATA_ERROR;
LEAVE
z->msg = (char*)"invalid bit length repeat";
r = Z_DATA_ERROR;
LEAVE
@@
-318,14
+318,14
@@
int r;
if (t != Z_OK)
{
if (t == (uInt)Z_DATA_ERROR)
if (t != Z_OK)
{
if (t == (uInt)Z_DATA_ERROR)
-
{
-
ZFREE(z, s->sub.trees.blens);
-
s->mode = z
BAD;
-
}
+ {
+ ZFREE(z, s->sub.trees.blens);
+
s->mode =
BAD;
+ }
r = t;
LEAVE
}
r = t;
LEAVE
}
- ZFREE(z, s->sub.trees.blens);
+
ZFREE(z, s->sub.trees.blens);
Tracev((stderr, "inflate: trees ok\n"));
if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
{
Tracev((stderr, "inflate: trees ok\n"));
if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
{
@@
-359,7
+359,7
@@
int r;
case DONE:
r = Z_STREAM_END;
LEAVE
case DONE:
r = Z_STREAM_END;
LEAVE
- case
z
BAD:
+ case BAD:
r = Z_DATA_ERROR;
LEAVE
default:
r = Z_DATA_ERROR;
LEAVE
default: