@@ -1,3 +1,7 @@

+Tue Oct 15 16:00:14 2013 EDT 2013 (dar)

+------------------------------------

+ * libclamav: bb #8696 - Bug reported by NIW Solutions

+

 Fri Oct 11 16:50:34 2013 EDT 2013 (dar)

 ------------------------------------

  * bb #9072: clamscan message separator fix

@@ -154,9 +154,9 @@ static int find_stream_bounds(const char *start, off_t bytesleft, off_t byteslef

 	    return 0;

 	if (bytesleft >= 2 && q2[0] == '\xd' && q2[1] == '\xa') {

 	    q2 += 2;

-	    if (newline_hack && q2[0] == '\xa')

+	    if (newline_hack && (bytesleft > 2) && q2[0] == '\xa')

 		q2++;

-	} else if (q2[0] == '\xa')

+	} else if (bytesleft && q2[0] == '\xa')

 	    q2++;

 	*stream = q2 - start;

 	bytesleft2 -= q2 - start;