sync with 0.93.3

git-svn: trunk@3922
0.95
Tomasz Kojm 17 years ago
parent 8be1d5a4bb
commit 17f74f9f5c
  1. 9
      ChangeLog
  2. 4
      clamd/others.c
  3. 2
      configure
  4. 2
      configure.in
  5. BIN
      docs/clamdoc.pdf
  6. 2
      docs/clamdoc.tex
  7. 4
      docs/html/clamdoc.html
  8. 4
      docs/html/index.html
  9. 2
      docs/html/node1.html
  10. 2
      docs/html/node10.html
  11. 2
      docs/html/node11.html
  12. 2
      docs/html/node12.html
  13. 2
      docs/html/node13.html
  14. 2
      docs/html/node14.html
  15. 2
      docs/html/node15.html
  16. 2
      docs/html/node16.html
  17. 2
      docs/html/node17.html
  18. 2
      docs/html/node18.html
  19. 2
      docs/html/node19.html
  20. 2
      docs/html/node2.html
  21. 2
      docs/html/node20.html
  22. 2
      docs/html/node21.html
  23. 2
      docs/html/node22.html
  24. 2
      docs/html/node23.html
  25. 2
      docs/html/node24.html
  26. 2
      docs/html/node25.html
  27. 2
      docs/html/node26.html
  28. 2
      docs/html/node27.html
  29. 2
      docs/html/node28.html
  30. 2
      docs/html/node29.html
  31. 2
      docs/html/node3.html
  32. 2
      docs/html/node30.html
  33. 2
      docs/html/node31.html
  34. 2
      docs/html/node32.html
  35. 2
      docs/html/node33.html
  36. 2
      docs/html/node34.html
  37. 2
      docs/html/node35.html
  38. 2
      docs/html/node36.html
  39. 2
      docs/html/node37.html
  40. 2
      docs/html/node38.html
  41. 2
      docs/html/node39.html
  42. 2
      docs/html/node4.html
  43. 2
      docs/html/node40.html
  44. 2
      docs/html/node41.html
  45. 2
      docs/html/node42.html
  46. 2
      docs/html/node43.html
  47. 2
      docs/html/node44.html
  48. 2
      docs/html/node45.html
  49. 2
      docs/html/node46.html
  50. 2
      docs/html/node47.html
  51. 2
      docs/html/node48.html
  52. 2
      docs/html/node49.html
  53. 2
      docs/html/node5.html
  54. 2
      docs/html/node50.html
  55. 2
      docs/html/node51.html
  56. 2
      docs/html/node52.html
  57. 2
      docs/html/node53.html
  58. 4
      docs/html/node54.html
  59. 2
      docs/html/node6.html
  60. 2
      docs/html/node7.html
  61. 2
      docs/html/node8.html
  62. 2
      docs/html/node9.html
  63. 4
      libclamav/mspack.c
  64. 2
      libclamav/others.c
  65. 10
      libclamav/petite.c

@ -1,3 +1,12 @@
Tue Jul 8 17:54:19 CEST 2008
-----------------------------
* libclamav/petite.c: fix another out of bounds memory read (bb#1000)
Reported by Secunia (CVE-2008-2713)
Tue Jul 8 17:54:12 CEST 2008
-----------------------------
* clamd/others.c: add missing checks for recv() failures (bb#1079)
Tue Jul 8 14:06:05 EEST 2008 (edwin)
-------------------------------------
* libclamav/dconf.[ch], htmlnorm.c, jsparse/js-norm.[ch], scanners.c:

@ -362,6 +362,8 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou
break;
}
n = recv(sockfd, buf, size, MSG_PEEK);
if(n < 0)
return -1;
if(read_command) {
if((n >= 1) && (buf[0] == 'n')) { /* Newline delimited command */
force_delim = 1;
@ -408,6 +410,8 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou
if(n == 0)
break;
}
if(n < 0)
return -1;
n += boff;
if(read_command) {
if((n >= 1) && (buf[0] == 'n')) { /* Need to strip leading 'n' from command to attain standard command */

2
configure vendored

@ -2795,7 +2795,7 @@ _ACEOF
LC_CURRENT=4
LC_REVISION=3
LC_REVISION=4
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

@ -44,7 +44,7 @@ dnl VERSION="0.93rc1"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=4
LC_REVISION=3
LC_REVISION=4
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])

Binary file not shown.

@ -71,7 +71,7 @@
\vspace{3cm}
\begin{flushright}
\rule[-1ex]{8cm}{3pt}\\
\huge Clam AntiVirus 0.93.1\\
\huge Clam AntiVirus 0.93.3\\
\huge \emph{User Manual}\\
\end{flushright}

@ -56,7 +56,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR>
<BR>
<DIV ALIGN="RIGHT">
<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.1
<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.3
<BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN>
<BR>
</BIG></BIG></DIV>
@ -211,7 +211,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -56,7 +56,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR>
<BR>
<DIV ALIGN="RIGHT">
<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.1
<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.3
<BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN>
<BR>
</BIG></BIG></DIV>
@ -211,7 +211,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -179,7 +179,7 @@ ClamAV and Clam AntiVirus are trademarks of Sourcefire, Inc.
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -96,7 +96,7 @@ A note for Solaris/SPARC users: you must set the <SPAN CLASS="textit">ABI</SPAN
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -75,7 +75,7 @@ Installing on shell account</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -69,7 +69,7 @@ Adding new system user and group</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -75,7 +75,7 @@ Compilation of base package</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -64,7 +64,7 @@ Compilation with clamav-milter enabled</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -83,7 +83,7 @@ Configuration</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -79,7 +79,7 @@ clamd</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -90,7 +90,7 @@ On-access scanning</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -81,7 +81,7 @@ define(`confINPUT_MAIL_FILTERS', `clmilter')
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -75,7 +75,7 @@ Testing</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -79,7 +79,7 @@ Introduction</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -139,7 +139,7 @@ N * * * * /usr/local/bin/freshclam --quiet
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -77,7 +77,7 @@ Closest mirrors</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -80,7 +80,7 @@ Usage</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -160,7 +160,7 @@ Start/end a <code>clamd</code> session - you can do multiple commands
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -76,7 +76,7 @@ Clam<SPAN CLASS="textbf">d</SPAN>scan</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -92,7 +92,7 @@ SIGTERM signal. In other case you can lose access
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -70,7 +70,7 @@ Output format</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -94,7 +94,7 @@ clamscan</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -83,7 +83,7 @@ Error messages are printed in the following format:
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -126,7 +126,7 @@ LibClamAV</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -183,7 +183,7 @@ Features</A>
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -65,7 +65,7 @@ Licence</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -77,7 +77,7 @@ Supported formats</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -87,7 +87,7 @@ Executables</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -62,7 +62,7 @@ Mail files</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -90,7 +90,7 @@ Archives and compressed files</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -73,7 +73,7 @@ Documents</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -75,7 +75,7 @@ Others</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -75,7 +75,7 @@ API</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -64,7 +64,7 @@ Header file</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -111,7 +111,7 @@ Load CVD files directly without unpacking them into a temporary
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -86,7 +86,7 @@ Alternatively you can try asking on the <code>#clamav</code> IRC channel - launc
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -68,7 +68,7 @@ Error handling</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -74,7 +74,7 @@ Engine structure</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -103,7 +103,7 @@ Database reloading</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -214,7 +214,7 @@ Phishing module: always block cloaked URLs.
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -62,7 +62,7 @@ Memory</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -65,7 +65,7 @@ Forking daemons</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -67,7 +67,7 @@ clamav-config</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -65,7 +65,7 @@ Example</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -82,7 +82,7 @@ Verification OK.
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -613,7 +613,7 @@ Contributors</A>
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -65,7 +65,7 @@ Virus submitting</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -459,7 +459,7 @@ Donors</A>
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -63,7 +63,7 @@ Graphics</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -62,7 +62,7 @@ OpenAntiVirus</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -134,7 +134,7 @@ Role: coder
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -64,11 +64,11 @@ Mathematics Department, Macquarie University, Sydney.
The command line arguments were: <BR>
<STRONG>latex2html</STRONG> <TT>-local_icons clamdoc.tex</TT>
<P>
The translation was initiated by Tomasz Kojm on 2008-06-04
The translation was initiated by Tomasz Kojm on 2008-07-07
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -71,7 +71,7 @@ Base package</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -80,7 +80,7 @@ Supported platforms</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -61,7 +61,7 @@ Binary packages</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -77,7 +77,7 @@ Installation</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
2008-06-04
2008-07-07
</ADDRESS>
</BODY>
</HTML>

@ -1286,6 +1286,8 @@ int lzx_decompress(struct lzx_stream *lzx, off_t out_bytes) {
}
else {
runsrc = rundest - match_offset;
if(i > (int) lzx->window_size - window_posn)
i = lzx->window_size - window_posn;
while (i-- > 0) *rundest++ = *runsrc++;
}
@ -1900,6 +1902,8 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {
}
else {
runsrc = rundest - match_offset;
if(i > (int) qtm->window_size - window_posn)
i = qtm->window_size - window_posn;
while (i-- > 0) *rundest++ = *runsrc++;
}
window_posn += match_length;

@ -87,7 +87,7 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;
#define P_tmpdir "C:\\WINDOWS\\TEMP"
#endif
#define CL_FLEVEL 32 /* don't touch it */
#define CL_FLEVEL 33 /* don't touch it */
uint8_t cli_debug_flag = 0, cli_leavetemps_flag = 0;

@ -214,8 +214,14 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct cli
/* Let's compact data */
for (t = 0; t < j ; t++) {
usects[t].raw = (t>0)?(usects[t-1].raw + usects[t-1].rsz):0;
if (usects[t].rsz != 0 && CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz))
memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);
if (usects[t].rsz != 0)
if(CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz)) {
memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);
} else {
cli_dbgmsg("Petite: Skipping section %d, Raw: %x, RSize:%x\n", t, usects[t].raw, usects[t].rsz);
usects[t].raw = t>0 ? usects[t-1].raw : 0;
usects[t].rsz = 0;
}
}
/* Showtime!!! */

Loading…
Cancel
Save