[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa
Stephen Gran
steve at lobefin.net
Thu Sep 4 12:36:39 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 8fb913e40f9bd0e5a8d60121fd370f996c9a60a5
Author: Stephen Gran <steve at lobefin.net>
Date: Thu Sep 4 13:25:16 2008 +0100
Revert "merge r3816 from trunk (bb #947, AIX name collisions)"
This reverts commit afb9146f420b688e8ad0a27d8f87d97b6702f922.
diff --git a/ChangeLog b/ChangeLog
index 08c8e2c..cd5f288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Mon Jun 30 21:28:23 EEST 2008 (edwin)
-------------------------------------
- * merge r3816 from trunk (bb #947, AIX name collisions)
-
Mon Jun 30 21:14:03 EEST 2008 (edwin)
------------------------------------
* freshclam/manager.c: add missing closesocket on error path (bb #1073).
diff --git a/libclamav/inflate64.c b/libclamav/inflate64.c
index d6479ad..7696fdd 100644
--- a/libclamav/inflate64.c
+++ b/libclamav/inflate64.c
@@ -416,17 +416,17 @@ int flush;
NEEDBITS(16);
if (
((BITS(8) << 8) + (hold >> 8)) % 31) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
if (BITS(4) != Z_DEFLATED) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
DROPBITS(4);
len = BITS(4) + 8;
if (len > state->wbits) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
state->dmax = 1U << len;
@@ -472,7 +472,7 @@ int flush;
state->mode = TABLE;
break;
case 3:
- state->mode = ACAB_BAD;
+ state->mode = BAD;
}
DROPBITS(2);
break;
@@ -480,7 +480,7 @@ int flush;
BYTEBITS(); /* go to byte boundary */
NEEDBITS(32);
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
state->length = (unsigned)hold & 0xffff;
@@ -515,7 +515,7 @@ int flush;
DROPBITS(4);
#ifndef PKZIP_BUG_WORKAROUND
if (state->nlen > 286 || state->ndist > 30) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
#endif
@@ -536,7 +536,7 @@ int flush;
ret = inflate_table(CODES, state->lens, 19, &(state->next),
&(state->lenbits), state->work);
if (ret) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
Tracev((stderr, "inflate: code lengths ok\n"));
@@ -559,7 +559,7 @@ int flush;
NEEDBITS(this.bits + 2);
DROPBITS(this.bits);
if (state->have == 0) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
len = state->lens[state->have - 1];
@@ -581,7 +581,7 @@ int flush;
DROPBITS(7);
}
if (state->have + copy > state->nlen + state->ndist) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
while (copy--)
@@ -590,7 +590,7 @@ int flush;
}
/* handle error breaks in while */
- if (state->mode == ACAB_BAD) break;
+ if (state->mode == BAD) break;
/* build code tables */
state->next = state->codes;
@@ -599,7 +599,7 @@ int flush;
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
&(state->lenbits), state->work);
if (ret) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
state->distcode = (code const FAR *)(state->next);
@@ -607,7 +607,7 @@ int flush;
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
&(state->next), &(state->distbits), state->work);
if (ret) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
Tracev((stderr, "inflate: codes ok\n"));
@@ -650,7 +650,7 @@ int flush;
break;
}
if (this.op & 64) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
state->extra = (unsigned)(this.op) & 31;
@@ -681,7 +681,7 @@ int flush;
}
DROPBITS(this.bits);
if (this.op & 64) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
Tracevv((stderr, "inflate: val %u\n", state->offset));
@@ -696,12 +696,12 @@ int flush;
}
#ifdef INFLATE_STRICT
if (state->offset > state->dmax) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
#endif
if (state->offset > state->whave + out - left) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
Tracevv((stderr, "inflate: distance %u\n", state->offset));
@@ -749,7 +749,7 @@ int flush;
out = left;
if ((
REVERSE(hold)) != state->check) {
- state->mode = ACAB_BAD;
+ state->mode = BAD;
break;
}
INITBITS();
@@ -759,7 +759,7 @@ int flush;
case DONE:
ret = Z_STREAM_END;
goto inf_leave;
- case ACAB_BAD:
+ case BAD:
ret = Z_DATA_ERROR;
goto inf_leave;
case MEM:
diff --git a/libclamav/inflate64_priv.h b/libclamav/inflate64_priv.h
index 38cbb6a..95c90e4 100644
--- a/libclamav/inflate64_priv.h
+++ b/libclamav/inflate64_priv.h
@@ -125,7 +125,7 @@ typedef enum {
CHECK, /* i: waiting for 32-bit check value */
LENGTH, /* i: waiting for 32-bit length (gzip) */
DONE, /* finished check, done -- remain here until reset */
- ACAB_BAD, /* got a data error -- remain here until reset */
+ BAD, /* got a data error -- remain here until reset */
MEM, /* got an inflate() memory error -- remain here until reset */
SYNC /* looking for synchronization bytes to restart inflate() */
} inflate_mode;
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list