fixed MIME detection using libmagic

1 files changed, 10 insertions, 7 deletions

diff --git a/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp b/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp
index cdc8926..4582353 100644
--- a/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp
+++ b/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp
@@ -24,17 +24,19 @@ LibMagicTypeDetect::~LibMagicTypeDetect( )
 
 MIMEType LibMagicTypeDetect::detect( RewindInputStream *s )
 {
-	enum { CHUNKSIZE = 1024 };
+	enum { CHUNKSIZE = 65535 };
 	enum { MAXBUFSIZE = 1024 * 1024 * 16 };
-	size_t bufsize = CHUNKSIZE;
-	char *buf = (char *)malloc( bufsize );
+	size_t bufsize = 0;
+	char *buf = (char *)malloc( CHUNKSIZE );
 	size_t offset = 0;
 	const char *res = 0;
 	MIMEType type;
 	
 	while( s->good( ) && !s->eof( ) ) {
 		s->read( buf + offset, CHUNKSIZE );
-		res = magic_buffer( m_magic, buf, bufsize );
+		std::streamsize n = s->gcount( );
+		
+		res = magic_buffer( m_magic, buf, bufsize + n );
 		
 		if( res != NULL ) {
 			type = MIMEType( res );
@@ -42,13 +44,14 @@ MIMEType LibMagicTypeDetect::detect( RewindInputStream *s )
 				break;
 			}
 		}
+		
+		bufsize += CHUNKSIZE;
+		offset += CHUNKSIZE;
 
 		if( bufsize > MAXBUFSIZE ) {
 			break;
 		}
-		
-		bufsize += CHUNKSIZE;
-		offset += CHUNKSIZE;
+
 		buf = (char *)realloc( buf, bufsize );
 	}