Merged from 2.4

Sun May 16 22:53:47 2004  Matthias Clasen  <maclas@gmx.de>

        Merged from 2.4

	* io-pnm.c (pnm_read_next_value): Don't read integers
	partially.  (#142584, Kouichirou Hiratsuka)
This commit is contained in:
Matthias Clasen 2004-05-17 03:08:15 +00:00 committed by Matthias Clasen
parent d9d8bda57e
commit d14f203bba
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
Sun May 16 22:53:47 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4
* io-pnm.c (pnm_read_next_value): Don't read integers
partially. (#142584, Kouichirou Hiratsuka)
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merged from 2.4:

View File

@ -237,7 +237,7 @@ pnm_read_next_value (PnmIOBuffer *inbuf, guint *value, GError **error)
*word = '\0';
/* hmmm, there must be more data to this 'word' */
if (!g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128))
if (p == inend || (!g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128)))
return PNM_SUSPEND;
/* get the value */