1. clamav-devel
  2. Commit 17f74f9f5c27f0fc37cd506e40cf6fe0b69c1ba0
Browse code

sync with 0.93.3

git-svn: trunk@3922

Tomasz Kojm authored on 2008/07/09 01:22:31
Showing 65 changed files
ChangeLog
History View file @ 17f74f9
... ... 
@@ -1,3 +1,12 @@
1 
+Tue Jul  8 17:54:19 CEST 2008
2 
+-----------------------------
3 
+  * libclamav/petite.c: fix another out of bounds memory read (bb#1000)
4 
+			Reported by Secunia (CVE-2008-2713)
5 
+
6 
+Tue Jul  8 17:54:12 CEST 2008
7 
+-----------------------------
8 
+  * clamd/others.c: add missing checks for recv() failures (bb#1079)
9 
+
1 10 
 Tue Jul  8 14:06:05 EEST 2008 (edwin)
2 11 
 -------------------------------------
3 12 
   * libclamav/dconf.[ch], htmlnorm.c, jsparse/js-norm.[ch], scanners.c:
clamd/others.c
History View file @ 17f74f9
... ... 
@@ -362,6 +362,8 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou
362 362 
 	break;
363 363 
     }
364 364 
     n = recv(sockfd, buf, size, MSG_PEEK);
365 
+    if(n < 0)
366 
+	return -1;
365 367 
     if(read_command) {
366 368 
 	if((n >= 1) && (buf[0] == 'n')) { /* Newline delimited command */
367 369 
 	    force_delim = 1;
... ... 
@@ -408,6 +410,8 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou
408 408 
 	if(n == 0)
409 409 
 	    break;
410 410 
     }
411 
+    if(n < 0)
412 
+	return -1;
411 413 
     n += boff;
412 414 
     if(read_command) {
413 415 
 	if((n >= 1) && (buf[0] == 'n')) { /* Need to strip leading 'n' from command to attain standard command */
configure
History View file @ 17f74f9
... ... 
@@ -2795,7 +2795,7 @@ _ACEOF
2795 2795
2796 2796
2797 2797 
 LC_CURRENT=4
2798 
-LC_REVISION=3
2798 
+LC_REVISION=4
2799 2799 
 LC_AGE=0
2800 2800 
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
2801 2801
configure.in
History View file @ 17f74f9
... ... 
@@ -44,7 +44,7 @@ dnl VERSION="0.93rc1"
44 44 
 AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
45 45
46 46 
 LC_CURRENT=4
47 
-LC_REVISION=3
47 
+LC_REVISION=4
48 48 
 LC_AGE=0
49 49 
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
50 50 
 AC_SUBST([LIBCLAMAV_VERSION])
docs/clamdoc.pdf
History View file @ 17f74f9
51 51 
Binary files a/docs/clamdoc.pdf and b/docs/clamdoc.pdf differ
docs/clamdoc.tex
History View file @ 17f74f9
... ... 
@@ -71,7 +71,7 @@
71 71 
     \vspace{3cm}
72 72 
     \begin{flushright}
73 73 
 	\rule[-1ex]{8cm}{3pt}\\
74 
-	\huge Clam AntiVirus 0.93.1\\
74 
+	\huge Clam AntiVirus 0.93.3\\
75 75 
 	\huge \emph{User Manual}\\
76 76 
     \end{flushright}
77 77
docs/html/clamdoc.html
History View file @ 17f74f9
... ... 
@@ -56,7 +56,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
56 56 
 <BR>
57 57 
 <BR>
58 58 
     <DIV ALIGN="RIGHT">
59 
-<BR>	<BIG CLASS="HUGE">Clam AntiVirus 0.93.1
59 
+<BR>	<BIG CLASS="HUGE">Clam AntiVirus 0.93.3
60 60 
 <BR>	<BIG CLASS="HUGE"><SPAN  CLASS="textit">User Manual</SPAN>
61 61 
 <BR>
62 62 
 </BIG></BIG></DIV>
... ... 
@@ -211,7 +211,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
211 211 
 <BR><HR>
212 212 
 <ADDRESS>
213 213 
 Tomasz Kojm
214 
-2008-06-04
214 
+2008-07-07
215 215 
 </ADDRESS>
216 216 
 </BODY>
217 217 
 </HTML>
docs/html/index.html
History View file @ 17f74f9
... ... 
@@ -56,7 +56,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
56 56 
 <BR>
57 57 
 <BR>
58 58 
     <DIV ALIGN="RIGHT">
59 
-<BR>	<BIG CLASS="HUGE">Clam AntiVirus 0.93.1
59 
+<BR>	<BIG CLASS="HUGE">Clam AntiVirus 0.93.3
60 60 
 <BR>	<BIG CLASS="HUGE"><SPAN  CLASS="textit">User Manual</SPAN>
61 61 
 <BR>
62 62 
 </BIG></BIG></DIV>
... ... 
@@ -211,7 +211,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
211 211 
 <BR><HR>
212 212 
 <ADDRESS>
213 213 
 Tomasz Kojm
214 
-2008-06-04
214 
+2008-07-07
215 215 
 </ADDRESS>
216 216 
 </BODY>
217 217 
 </HTML>
docs/html/node1.html
History View file @ 17f74f9
... ... 
@@ -179,7 +179,7 @@ ClamAV and Clam AntiVirus are trademarks of Sourcefire, Inc.
179 179 
 <BR><HR>
180 180 
 <ADDRESS>
181 181 
 Tomasz Kojm
182 
-2008-06-04
182 
+2008-07-07
183 183 
 </ADDRESS>
184 184 
 </BODY>
185 185 
 </HTML>
docs/html/node10.html
History View file @ 17f74f9
... ... 
@@ -96,7 +96,7 @@ A note for Solaris/SPARC users: you must set the <SPAN  CLASS="textit">ABI</SPAN
96 96 
 <BR><HR>
97 97 
 <ADDRESS>
98 98 
 Tomasz Kojm
99 
-2008-06-04
99 
+2008-07-07
100 100 
 </ADDRESS>
101 101 
 </BODY>
102 102 
 </HTML>
docs/html/node11.html
History View file @ 17f74f9
... ... 
@@ -75,7 +75,7 @@ Installing on shell account</A>
75 75 
 <BR><HR>
76 76 
 <ADDRESS>
77 77 
 Tomasz Kojm
78 
-2008-06-04
78 
+2008-07-07
79 79 
 </ADDRESS>
80 80 
 </BODY>
81 81 
 </HTML>
docs/html/node12.html
History View file @ 17f74f9
... ... 
@@ -69,7 +69,7 @@ Adding new system user and group</A>
69 69 
 <BR><HR>
70 70 
 <ADDRESS>
71 71 
 Tomasz Kojm
72 
-2008-06-04
72 
+2008-07-07
73 73 
 </ADDRESS>
74 74 
 </BODY>
75 75 
 </HTML>
docs/html/node13.html
History View file @ 17f74f9
... ... 
@@ -75,7 +75,7 @@ Compilation of base package</A>
75 75 
 <BR><HR>
76 76 
 <ADDRESS>
77 77 
 Tomasz Kojm
78 
-2008-06-04
78 
+2008-07-07
79 79 
 </ADDRESS>
80 80 
 </BODY>
81 81 
 </HTML>
docs/html/node14.html
History View file @ 17f74f9
... ... 
@@ -64,7 +64,7 @@ Compilation with clamav-milter enabled</A>
64 64 
 <BR><HR>
65 65 
 <ADDRESS>
66 66 
 Tomasz Kojm
67 
-2008-06-04
67 
+2008-07-07
68 68 
 </ADDRESS>
69 69 
 </BODY>
70 70 
 </HTML>
docs/html/node15.html
History View file @ 17f74f9
... ... 
@@ -83,7 +83,7 @@ Configuration</A>
83 83 
 <BR><HR>
84 84 
 <ADDRESS>
85 85 
 Tomasz Kojm
86 
-2008-06-04
86 
+2008-07-07
87 87 
 </ADDRESS>
88 88 
 </BODY>
89 89 
 </HTML>
docs/html/node16.html
History View file @ 17f74f9
... ... 
@@ -79,7 +79,7 @@ clamd</A>
79 79 
 <BR><HR>
80 80 
 <ADDRESS>
81 81 
 Tomasz Kojm
82 
-2008-06-04
82 
+2008-07-07
83 83 
 </ADDRESS>
84 84 
 </BODY>
85 85 
 </HTML>
docs/html/node17.html
History View file @ 17f74f9
... ... 
@@ -90,7 +90,7 @@ On-access scanning</A>
90 90 
 <BR><HR>
91 91 
 <ADDRESS>
92 92 
 Tomasz Kojm
93 
-2008-06-04
93 
+2008-07-07
94 94 
 </ADDRESS>
95 95 
 </BODY>
96 96 
 </HTML>
docs/html/node18.html
History View file @ 17f74f9
... ... 
@@ -81,7 +81,7 @@ define(`confINPUT_MAIL_FILTERS', `clmilter')
81 81 
 <BR><HR>
82 82 
 <ADDRESS>
83 83 
 Tomasz Kojm
84 
-2008-06-04
84 
+2008-07-07
85 85 
 </ADDRESS>
86 86 
 </BODY>
87 87 
 </HTML>
docs/html/node19.html
History View file @ 17f74f9
... ... 
@@ -75,7 +75,7 @@ Testing</A>
75 75 
 <BR><HR>
76 76 
 <ADDRESS>
77 77 
 Tomasz Kojm
78 
-2008-06-04
78 
+2008-07-07
79 79 
 </ADDRESS>
80 80 
 </BODY>
81 81 
 </HTML>
docs/html/node2.html
History View file @ 17f74f9
... ... 
@@ -79,7 +79,7 @@ Introduction</A>
79 79 
 <BR><HR>
80 80 
 <ADDRESS>
81 81 
 Tomasz Kojm
82 
-2008-06-04
82 
+2008-07-07
83 83 
 </ADDRESS>
84 84 
 </BODY>
85 85 
 </HTML>
docs/html/node20.html
History View file @ 17f74f9
... ... 
@@ -139,7 +139,7 @@ N * * * *	/usr/local/bin/freshclam --quiet
139 139 
 <!--End of Navigation Panel-->
140 140 
 <ADDRESS>
141 141 
 Tomasz Kojm
142 
-2008-06-04
142 
+2008-07-07
143 143 
 </ADDRESS>
144 144 
 </BODY>
145 145 
 </HTML>
docs/html/node21.html
History View file @ 17f74f9
... ... 
@@ -77,7 +77,7 @@ Closest mirrors</A>
77 77 
 <BR><HR>
78 78 
 <ADDRESS>
79 79 
 Tomasz Kojm
80 
-2008-06-04
80 
+2008-07-07
81 81 
 </ADDRESS>
82 82 
 </BODY>
83 83 
 </HTML>
docs/html/node22.html
History View file @ 17f74f9
... ... 
@@ -80,7 +80,7 @@ Usage</A>
80 80 
 <BR><HR>
81 81 
 <ADDRESS>
82 82 
 Tomasz Kojm
83 
-2008-06-04
83 
+2008-07-07
84 84 
 </ADDRESS>
85 85 
 </BODY>
86 86 
 </HTML>
docs/html/node23.html
History View file @ 17f74f9
... ... 
@@ -160,7 +160,7 @@ Start/end a <code>clamd</code> session - you can do multiple commands
160 160 
 <!--End of Navigation Panel-->
161 161 
 <ADDRESS>
162 162 
 Tomasz Kojm
163 
-2008-06-04
163 
+2008-07-07
164 164 
 </ADDRESS>
165 165 
 </BODY>
166 166 
 </HTML>
docs/html/node24.html
History View file @ 17f74f9
... ... 
@@ -76,7 +76,7 @@ Clam<SPAN  CLASS="textbf">d</SPAN>scan</A>
76 76 
 <BR><HR>
77 77 
 <ADDRESS>
78 78 
 Tomasz Kojm
79 
-2008-06-04
79 
+2008-07-07
80 80 
 </ADDRESS>
81 81 
 </BODY>
82 82 
 </HTML>
docs/html/node25.html
History View file @ 17f74f9
... ... 
@@ -92,7 +92,7 @@ SIGTERM signal. In other case you can lose access
92 92 
 <BR><HR>
93 93 
 <ADDRESS>
94 94 
 Tomasz Kojm
95 
-2008-06-04
95 
+2008-07-07
96 96 
 </ADDRESS>
97 97 
 </BODY>
98 98 
 </HTML>
docs/html/node26.html
History View file @ 17f74f9
... ... 
@@ -70,7 +70,7 @@ Output format</A>
70 70 
 <BR><HR>
71 71 
 <ADDRESS>
72 72 
 Tomasz Kojm
73 
-2008-06-04
73 
+2008-07-07
74 74 
 </ADDRESS>
75 75 
 </BODY>
76 76 
 </HTML>
docs/html/node27.html
History View file @ 17f74f9
... ... 
@@ -94,7 +94,7 @@ clamscan</A>
94 94 
 <BR><HR>
95 95 
 <ADDRESS>
96 96 
 Tomasz Kojm
97 
-2008-06-04
97 
+2008-07-07
98 98 
 </ADDRESS>
99 99 
 </BODY>
100 100 
 </HTML>
docs/html/node28.html
History View file @ 17f74f9
... ... 
@@ -83,7 +83,7 @@ Error messages are printed in the following format:
83 83 
 <BR><HR>
84 84 
 <ADDRESS>
85 85 
 Tomasz Kojm
86 
-2008-06-04
86 
+2008-07-07
87 87 
 </ADDRESS>
88 88 
 </BODY>
89 89 
 </HTML>
docs/html/node29.html
History View file @ 17f74f9
... ... 
@@ -126,7 +126,7 @@ LibClamAV</A>
126 126 
 <BR><HR>
127 127 
 <ADDRESS>
128 128 
 Tomasz Kojm
129 
-2008-06-04
129 
+2008-07-07
130 130 
 </ADDRESS>
131 131 
 </BODY>
132 132 
 </HTML>
docs/html/node3.html
History View file @ 17f74f9
... ... 
@@ -183,7 +183,7 @@ Features</A>
183 183 
 <!--End of Navigation Panel-->
184 184 
 <ADDRESS>
185 185 
 Tomasz Kojm
186 
-2008-06-04
186 
+2008-07-07
187 187 
 </ADDRESS>
188 188 
 </BODY>
189 189 
 </HTML>
docs/html/node30.html
History View file @ 17f74f9
... ... 
@@ -65,7 +65,7 @@ Licence</A>
65 65 
 <BR><HR>
66 66 
 <ADDRESS>
67 67 
 Tomasz Kojm
68 
-2008-06-04
68 
+2008-07-07
69 69 
 </ADDRESS>
70 70 
 </BODY>
71 71 
 </HTML>
docs/html/node31.html
History View file @ 17f74f9
... ... 
@@ -77,7 +77,7 @@ Supported formats</A>
77 77 
 <BR><HR>
78 78 
 <ADDRESS>
79 79 
 Tomasz Kojm
80 
-2008-06-04
80 
+2008-07-07
81 81 
 </ADDRESS>
82 82 
 </BODY>
83 83 
 </HTML>
docs/html/node32.html
History View file @ 17f74f9
... ... 
@@ -87,7 +87,7 @@ Executables</A>
87 87 
 <BR><HR>
88 88 
 <ADDRESS>
89 89 
 Tomasz Kojm
90 
-2008-06-04
90 
+2008-07-07
91 91 
 </ADDRESS>
92 92 
 </BODY>
93 93 
 </HTML>
docs/html/node33.html
History View file @ 17f74f9
... ... 
@@ -62,7 +62,7 @@ Mail files</A>
62 62 
 <BR><HR>
63 63 
 <ADDRESS>
64 64 
 Tomasz Kojm
65 
-2008-06-04
65 
+2008-07-07
66 66 
 </ADDRESS>
67 67 
 </BODY>
68 68 
 </HTML>
docs/html/node34.html
History View file @ 17f74f9
... ... 
@@ -90,7 +90,7 @@ Archives and compressed files</A>
90 90 
 <BR><HR>
91 91 
 <ADDRESS>
92 92 
 Tomasz Kojm
93 
-2008-06-04
93 
+2008-07-07
94 94 
 </ADDRESS>
95 95 
 </BODY>
96 96 
 </HTML>
docs/html/node35.html
History View file @ 17f74f9
... ... 
@@ -73,7 +73,7 @@ Documents</A>
73 73 
 <BR><HR>
74 74 
 <ADDRESS>
75 75 
 Tomasz Kojm
76 
-2008-06-04
76 
+2008-07-07
77 77 
 </ADDRESS>
78 78 
 </BODY>
79 79 
 </HTML>
docs/html/node36.html
History View file @ 17f74f9
... ... 
@@ -75,7 +75,7 @@ Others</A>
75 75 
 <BR><HR>
76 76 
 <ADDRESS>
77 77 
 Tomasz Kojm
78 
-2008-06-04
78 
+2008-07-07
79 79 
 </ADDRESS>
80 80 
 </BODY>
81 81 
 </HTML>
docs/html/node37.html
History View file @ 17f74f9
... ... 
@@ -75,7 +75,7 @@ API</A>
75 75 
 <BR><HR>
76 76 
 <ADDRESS>
77 77 
 Tomasz Kojm
78 
-2008-06-04
78 
+2008-07-07
79 79 
 </ADDRESS>
80 80 
 </BODY>
81 81 
 </HTML>
docs/html/node38.html
History View file @ 17f74f9
... ... 
@@ -64,7 +64,7 @@ Header file</A>
64 64 
 <BR><HR>
65 65 
 <ADDRESS>
66 66 
 Tomasz Kojm
67 
-2008-06-04
67 
+2008-07-07
68 68 
 </ADDRESS>
69 69 
 </BODY>
70 70 
 </HTML>
docs/html/node39.html
History View file @ 17f74f9
... ... 
@@ -111,7 +111,7 @@ Load CVD files directly without unpacking them into a temporary
111 111 
 <BR><HR>
112 112 
 <ADDRESS>
113 113 
 Tomasz Kojm
114 
-2008-06-04
114 
+2008-07-07
115 115 
 </ADDRESS>
116 116 
 </BODY>
117 117 
 </HTML>
docs/html/node4.html
History View file @ 17f74f9
... ... 
@@ -86,7 +86,7 @@ Alternatively you can try asking on the <code>#clamav</code> IRC channel - launc
86 86 
 <BR><HR>
87 87 
 <ADDRESS>
88 88 
 Tomasz Kojm
89 
-2008-06-04
89 
+2008-07-07
90 90 
 </ADDRESS>
91 91 
 </BODY>
92 92 
 </HTML>
docs/html/node40.html
History View file @ 17f74f9
... ... 
@@ -68,7 +68,7 @@ Error handling</A>
68 68 
 <BR><HR>
69 69 
 <ADDRESS>
70 70 
 Tomasz Kojm
71 
-2008-06-04
71 
+2008-07-07
72 72 
 </ADDRESS>
73 73 
 </BODY>
74 74 
 </HTML>
docs/html/node41.html
History View file @ 17f74f9
... ... 
@@ -74,7 +74,7 @@ Engine structure</A>
74 74 
 <BR><HR>
75 75 
 <ADDRESS>
76 76 
 Tomasz Kojm
77 
-2008-06-04
77 
+2008-07-07
78 78 
 </ADDRESS>
79 79 
 </BODY>
80 80 
 </HTML>
docs/html/node42.html
History View file @ 17f74f9
... ... 
@@ -103,7 +103,7 @@ Database reloading</A>
103 103 
 <BR><HR>
104 104 
 <ADDRESS>
105 105 
 Tomasz Kojm
106 
-2008-06-04
106 
+2008-07-07
107 107 
 </ADDRESS>
108 108 
 </BODY>
109 109 
 </HTML>
docs/html/node43.html
History View file @ 17f74f9
... ... 
@@ -214,7 +214,7 @@ Phishing module: always block cloaked URLs.
214 214 
 <!--End of Navigation Panel-->
215 215 
 <ADDRESS>
216 216 
 Tomasz Kojm
217 
-2008-06-04
217 
+2008-07-07
218 218 
 </ADDRESS>
219 219 
 </BODY>
220 220 
 </HTML>
docs/html/node44.html
History View file @ 17f74f9
... ... 
@@ -62,7 +62,7 @@ Memory</A>
62 62 
 <BR><HR>
63 63 
 <ADDRESS>
64 64 
 Tomasz Kojm
65 
-2008-06-04
65 
+2008-07-07
66 66 
 </ADDRESS>
67 67 
 </BODY>
68 68 
 </HTML>
docs/html/node45.html
History View file @ 17f74f9
... ... 
@@ -65,7 +65,7 @@ Forking daemons</A>
65 65 
 <BR><HR>
66 66 
 <ADDRESS>
67 67 
 Tomasz Kojm
68 
-2008-06-04
68 
+2008-07-07
69 69 
 </ADDRESS>
70 70 
 </BODY>
71 71 
 </HTML>
docs/html/node46.html
History View file @ 17f74f9
... ... 
@@ -67,7 +67,7 @@ clamav-config</A>
67 67 
 <BR><HR>
68 68 
 <ADDRESS>
69 69 
 Tomasz Kojm
70 
-2008-06-04
70 
+2008-07-07
71 71 
 </ADDRESS>
72 72 
 </BODY>
73 73 
 </HTML>
docs/html/node47.html
History View file @ 17f74f9
... ... 
@@ -65,7 +65,7 @@ Example</A>
65 65 
 <BR><HR>
66 66 
 <ADDRESS>
67 67 
 Tomasz Kojm
68 
-2008-06-04
68 
+2008-07-07
69 69 
 </ADDRESS>
70 70 
 </BODY>
71 71 
 </HTML>
docs/html/node48.html
History View file @ 17f74f9
... ... 
@@ -82,7 +82,7 @@ Verification OK.
82 82 
 <BR><HR>
83 83 
 <ADDRESS>
84 84 
 Tomasz Kojm
85 
-2008-06-04
85 
+2008-07-07
86 86 
 </ADDRESS>
87 87 
 </BODY>
88 88 
 </HTML>
docs/html/node49.html
History View file @ 17f74f9
... ... 
@@ -613,7 +613,7 @@ Contributors</A>
613 613 
 <!--End of Navigation Panel-->
614 614 
 <ADDRESS>
615 615 
 Tomasz Kojm
616 
-2008-06-04
616 
+2008-07-07
617 617 
 </ADDRESS>
618 618 
 </BODY>
619 619 
 </HTML>
docs/html/node5.html
History View file @ 17f74f9
... ... 
@@ -65,7 +65,7 @@ Virus submitting</A>
65 65 
 <BR><HR>
66 66 
 <ADDRESS>
67 67 
 Tomasz Kojm
68 
-2008-06-04
68 
+2008-07-07
69 69 
 </ADDRESS>
70 70 
 </BODY>
71 71 
 </HTML>
docs/html/node50.html
History View file @ 17f74f9
... ... 
@@ -459,7 +459,7 @@ Donors</A>
459 459 
 <!--End of Navigation Panel-->
460 460 
 <ADDRESS>
461 461 
 Tomasz Kojm
462 
-2008-06-04
462 
+2008-07-07
463 463 
 </ADDRESS>
464 464 
 </BODY>
465 465 
 </HTML>
docs/html/node51.html
History View file @ 17f74f9
... ... 
@@ -63,7 +63,7 @@ Graphics</A>
63 63 
 <BR><HR>
64 64 
 <ADDRESS>
65 65 
 Tomasz Kojm
66 
-2008-06-04
66 
+2008-07-07
67 67 
 </ADDRESS>
68 68 
 </BODY>
69 69 
 </HTML>
docs/html/node52.html
History View file @ 17f74f9
... ... 
@@ -62,7 +62,7 @@ OpenAntiVirus</A>
62 62 
 <BR><HR>
63 63 
 <ADDRESS>
64 64 
 Tomasz Kojm
65 
-2008-06-04
65 
+2008-07-07
66 66 
 </ADDRESS>
67 67 
 </BODY>
68 68 
 </HTML>
docs/html/node53.html
History View file @ 17f74f9
... ... 
@@ -134,7 +134,7 @@ Role: coder
134 134 
 <BR><HR>
135 135 
 <ADDRESS>
136 136 
 Tomasz Kojm
137 
-2008-06-04
137 
+2008-07-07
138 138 
 </ADDRESS>
139 139 
 </BODY>
140 140 
 </HTML>
docs/html/node54.html
History View file @ 17f74f9
... ... 
@@ -64,11 +64,11 @@ Mathematics Department, Macquarie University, Sydney.
64 64 
 The command line arguments were: <BR>
65 65 
  <STRONG>latex2html</STRONG> <TT>-local_icons clamdoc.tex</TT>
66 66 
 <P>
67 
-The translation was initiated by Tomasz Kojm on 2008-06-04
67 
+The translation was initiated by Tomasz Kojm on 2008-07-07
68 68 
 <BR><HR>
69 69 
 <ADDRESS>
70 70 
 Tomasz Kojm
71 
-2008-06-04
71 
+2008-07-07
72 72 
 </ADDRESS>
73 73 
 </BODY>
74 74 
 </HTML>
docs/html/node6.html
History View file @ 17f74f9
... ... 
@@ -71,7 +71,7 @@ Base package</A>
71 71 
 <BR><HR>
72 72 
 <ADDRESS>
73 73 
 Tomasz Kojm
74 
-2008-06-04
74 
+2008-07-07
75 75 
 </ADDRESS>
76 76 
 </BODY>
77 77 
 </HTML>
docs/html/node7.html
History View file @ 17f74f9
... ... 
@@ -80,7 +80,7 @@ Supported platforms</A>
80 80 
 <BR><HR>
81 81 
 <ADDRESS>
82 82 
 Tomasz Kojm
83 
-2008-06-04
83 
+2008-07-07
84 84 
 </ADDRESS>
85 85 
 </BODY>
86 86 
 </HTML>
docs/html/node8.html
History View file @ 17f74f9
... ... 
@@ -61,7 +61,7 @@ Binary packages</A>
61 61 
 <BR><HR>
62 62 
 <ADDRESS>
63 63 
 Tomasz Kojm
64 
-2008-06-04
64 
+2008-07-07
65 65 
 </ADDRESS>
66 66 
 </BODY>
67 67 
 </HTML>
docs/html/node9.html
History View file @ 17f74f9
... ... 
@@ -77,7 +77,7 @@ Installation</A>
77 77 
 <BR><HR>
78 78 
 <ADDRESS>
79 79 
 Tomasz Kojm
80 
-2008-06-04
80 
+2008-07-07
81 81 
 </ADDRESS>
82 82 
 </BODY>
83 83 
 </HTML>
libclamav/mspack.c
History View file @ 17f74f9
... ... 
@@ -1286,6 +1286,8 @@ int lzx_decompress(struct lzx_stream *lzx, off_t out_bytes) {
1286 1286 
 	    }
1287 1287 
 	    else {
1288 1288 
 	      runsrc = rundest - match_offset;
1289 
+	      if(i > (int) lzx->window_size - window_posn)
1290 
+	        i = lzx->window_size - window_posn;
1289 1291 
 	      while (i-- > 0) *rundest++ = *runsrc++;
1290 1292 
 	    }
1291 1293
... ... 
@@ -1900,6 +1902,8 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {
1900 1900 
 	}
1901 1901 
 	else {
1902 1902 
 	  runsrc = rundest - match_offset;
1903 
+	  if(i > (int) qtm->window_size - window_posn)
1904 
+	    i = qtm->window_size - window_posn;
1903 1905 
 	  while (i-- > 0) *rundest++ = *runsrc++;
1904 1906 
 	}
1905 1907 
 	window_posn += match_length;
libclamav/others.c
History View file @ 17f74f9
... ... 
@@ -87,7 +87,7 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;
87 87 
 #define       P_tmpdir        "C:\\WINDOWS\\TEMP"
88 88 
 #endif
89 89
90 
-#define CL_FLEVEL 32 /* don't touch it */
90 
+#define CL_FLEVEL 33 /* don't touch it */
91 91
92 92 
 uint8_t cli_debug_flag = 0, cli_leavetemps_flag = 0;
93 93
libclamav/petite.c
History View file @ 17f74f9
... ... 
@@ -214,8 +214,14 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct cli
214 214 
       /* Let's compact data */
215 215 
       for (t = 0; t < j ; t++) {
216 216 
 	usects[t].raw = (t>0)?(usects[t-1].raw + usects[t-1].rsz):0;
217 
-	if (usects[t].rsz != 0 && CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz))
218 
-	  memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);
217 
+	if (usects[t].rsz != 0)
218 
+	  if(CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz)) {
219 
+	    memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);
220 
+	  } else {
221 
+	    cli_dbgmsg("Petite: Skipping section %d, Raw: %x, RSize:%x\n", t, usects[t].raw, usects[t].rsz);
222 
+	    usects[t].raw = t>0 ? usects[t-1].raw : 0;
223 
+	    usects[t].rsz = 0;
224 
+	  }
219 225 
       }
220 226
221 227 
       /* Showtime!!! */