diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 01771831b9..edeb03b1a5 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-04  Havoc Pennington  <hp@redhat.com>
+
+	* io-pnm.c (pnm_skip_whitespace): patch from Szekeres Istvan,
+	bug #52560
+
 2001-06-01  Havoc Pennington  <hp@redhat.com>
 
         Apply patch from sandmann@daimi.au.dk, with some tweaks.
diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index cd7dd9d9bd..dfa5cb3467 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -195,7 +195,14 @@ pnm_skip_whitespace (PnmIOBuffer *inbuf, GError **error)
 	for ( ; inptr < inend; inptr++) {
 		if (*inptr == '#') {
 			/* in comment - skip to the end of this line */
-			for ( ; *inptr != '\n' && inptr < inend; inptr++);
+			for ( ; *inptr != '\n' && inptr < inend; inptr++)
+				;
+			
+			if ( *inptr != '\n' ) {
+				/* couldn't read whole comment */
+				return PNM_SUSPEND;
+			}
+			
 		} else if (!isspace (*inptr)) {
 			inbuf->byte = inptr;
 			inbuf->nbytes = (guint) (inend - inptr);