diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-05-17 03:08:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-05-17 03:08:15 +0000 |
| commit | d14f203bba5284c76fd9573186ac058f9e005763 (patch) | |
| tree | 654b218bedbcbc58eb4d9cf931dfc5e421026a04 /gdk-pixbuf | |
| parent | d9d8bda57e62da65f97728e094725e6d39d93d29 (diff) | |
| download | gtk+-d14f203bba5284c76fd9573186ac058f9e005763.tar.gz | |
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)
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/io-pnm.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 59c86dc4ac..489bba04da 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -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: diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c index 437ccaf0e0..39b7d36337 100644 --- a/gdk-pixbuf/io-pnm.c +++ b/gdk-pixbuf/io-pnm.c @@ -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 */ |