From 998b5eea4593d92adaf2141854d6a7a55e453f43 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 11 Nov 2019 07:53:36 +0000
Subject: [PATCH] fix svgload sniff

by adding vips_streami_sniff_at_most()
---
 libvips/foreign/svgload.c     |  6 ++-
 libvips/include/vips/stream.h |  2 +
 libvips/iofuncs/streami.c     | 82 +++++++++++++++++++++++++++--------
 3 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/libvips/foreign/svgload.c b/libvips/foreign/svgload.c
index 029f4266..10bd57bf 100644
--- a/libvips/foreign/svgload.c
+++ b/libvips/foreign/svgload.c
@@ -474,11 +474,13 @@ gboolean
 vips_foreign_load_svg_stream_is_a( VipsStreami *input )
 {
 	unsigned char *data;
+	size_t bytes_read;
 
-	if( !(data = vips_streami_sniff( input, SVG_HEADER_SIZE )) )
+	if( (bytes_read = vips_streami_sniff_at_most( input, 
+		&data, SVG_HEADER_SIZE )) <= 0 )
 		return( FALSE );
 
-	return( vips_foreign_load_svg_is_a( data, SVG_HEADER_SIZE ) );
+	return( vips_foreign_load_svg_is_a( data, bytes_read ) );
 }
 
 static int
diff --git a/libvips/include/vips/stream.h b/libvips/include/vips/stream.h
index 683e9f6e..21beee53 100644
--- a/libvips/include/vips/stream.h
+++ b/libvips/include/vips/stream.h
@@ -211,6 +211,8 @@ ssize_t vips_streami_read( VipsStreami *streami, void *data, size_t length );
 const void *vips_streami_map( VipsStreami *streami, size_t *length );
 gint64 vips_streami_seek( VipsStreami *streami, gint64 offset, int whence );
 int vips_streami_rewind( VipsStreami *streami );
+size_t vips_streami_sniff_at_most( VipsStreami *streami, 
+	unsigned char **data, size_t length );
 unsigned char *vips_streami_sniff( VipsStreami *streami, size_t length );
 gint64 vips_streami_size( VipsStreami *streami ); 
 
diff --git a/libvips/iofuncs/streami.c b/libvips/iofuncs/streami.c
index c1dd8b09..4e991c48 100644
--- a/libvips/iofuncs/streami.c
+++ b/libvips/iofuncs/streami.c
@@ -42,6 +42,7 @@
 /*
 #define VIPS_DEBUG
  */
+#define TEST_SANITY
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -88,7 +89,7 @@
 
 G_DEFINE_TYPE( VipsStreami, vips_streami, VIPS_TYPE_STREAM );
 
-#ifdef VIPS_DEBUG
+#ifdef TEST_SANITY
 static void
 vips_streami_sanity( VipsStreami *streami )
 {
@@ -177,13 +178,14 @@ vips_streami_sanity( VipsStreami *streami )
 			 VIPS_STREAM( streami )->descriptor) );
 	}
 }
-#endif /*VIPS_DEBUG*/
+#endif /*TEST_SANITY*/
 
-#ifdef VIPS_DEBUG
+#ifdef TEST_SANITY
 #define SANITY( S ) vips_streami_sanity( S )
-#else /*!VIPS_DEBUG*/
+#warning "sanity tests on in streami.c"
+#else /*!TEST_SANITY*/
 #define SANITY( S )
-#endif /*VIPS_DEBUG*/
+#endif /*TEST_SANITY*/
 
 static void
 vips_streami_finalize( GObject *gobject )
@@ -1011,33 +1013,75 @@ vips_streami_size( VipsStreami *streami )
 }
 
 /**
- * vips_streami_sniff: 
- * @streami: sniff this stream
- * @length: number of bytes to sniff
+ * vips_streami_peek: 
+ * @streami: peek this stream
+ * @data: return a pointer to the bytes read here
+ * @length: max number of bytes to read
  *
- * Return a pointer to the first few bytes of the file.
+ * Attempt to sniff at most @length bytes from the start of the stream. A 
+ * pointer to the bytes is returned in @data. The number of bytes actually 
+ * read is returned -- it may be less than @length if the file is shorter than
+ * @length. A negative number indicates a read error.
+ *
+ * Returns: number of bytes read, or -1 on error.
  */
-unsigned char *
-vips_streami_sniff( VipsStreami *streami, size_t length )
+size_t
+vips_streami_sniff_at_most( VipsStreami *streami, 
+	unsigned char **data, size_t length )
 {
-	ssize_t n;
 	unsigned char *q;
+	size_t bytes_read;
 
-	VIPS_DEBUG_MSG( "vips_streami_sniff: %zd bytes\n", length );
+	VIPS_DEBUG_MSG( "vips_streami_sniff_at_most: %zd bytes\n", length );
 
 	SANITY( streami );
 
 	if( vips_streami_rewind( streami ) )
-		return( NULL );
+		return( -1 );
 
 	g_byte_array_set_size( streami->sniff, length );
 
-	for( q = streami->sniff->data; length > 0; length -= n, q += n )
-		if( (n = vips_streami_read( streami, q, length )) == -1 ||
-			n == 0 )
-			return( NULL );
+	q = streami->sniff->data;
+	bytes_read = 0; 
+	while( bytes_read < length ) {
+		ssize_t n;
+
+		n = vips_streami_read( streami, q, length - bytes_read );
+		if( n == -1 )
+			return( -1 );
+		if( n == 0 )
+			break;
+
+		bytes_read += n;
+		q += n;
+	}
 
 	SANITY( streami );
 
-	return( streami->sniff->data );
+	*data = streami->sniff->data;
+
+	return( bytes_read );
+}
+
+/**
+ * vips_streami_sniff: 
+ * @streami: sniff this stream
+ * @length: number of bytes to sniff
+ *
+ * Return a pointer to the first few bytes of the file. If the file is too
+ * short, return NULL.
+ *
+ * Returns: a pointer to the bytes at the start of the file, or NULL on error.
+ */
+unsigned char *
+vips_streami_sniff( VipsStreami *streami, size_t length )
+{
+	unsigned char *data;
+	size_t bytes_read;
+
+	bytes_read = vips_streami_sniff_at_most( streami, &data, length );
+	if( bytes_read < length )
+		return( NULL );
+
+	return( data );
 }