mirror of https://github.com/GNOME/gimp.git
Revert back to unsigned chars for the buffer, and only cast to gchar if we
2006-05-05 Manish Singh <yosh@gimp.org> * plug-ins/common/gifload.c (DoExtension): Revert back to unsigned chars for the buffer, and only cast to gchar if we know we're dealing with a comment. Fixes bug #339865.
This commit is contained in:
parent
2499c09161
commit
70eeb8ce7c
|
@ -1,3 +1,9 @@
|
||||||
|
2006-05-05 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* plug-ins/common/gifload.c (DoExtension): Revert back to unsigned
|
||||||
|
chars for the buffer, and only cast to gchar if we know we're dealing
|
||||||
|
with a comment. Fixes bug #339865.
|
||||||
|
|
||||||
2006-05-05 Michael Natterer <mitch@gimp.org>
|
2006-05-05 Michael Natterer <mitch@gimp.org>
|
||||||
|
|
||||||
* app/plug-in/gimppluginmanager-call.[ch]
|
* app/plug-in/gimppluginmanager-call.[ch]
|
||||||
|
|
|
@ -496,8 +496,8 @@ static int
|
||||||
DoExtension (FILE *fd,
|
DoExtension (FILE *fd,
|
||||||
int label)
|
int label)
|
||||||
{
|
{
|
||||||
static gchar buf[256];
|
static guchar buf[256];
|
||||||
gchar *str;
|
gchar *str;
|
||||||
|
|
||||||
switch (label)
|
switch (label)
|
||||||
{
|
{
|
||||||
|
@ -536,7 +536,9 @@ DoExtension (FILE *fd,
|
||||||
str = "Comment Extension";
|
str = "Comment Extension";
|
||||||
while (GetDataBlock (fd, (unsigned char *) buf) > 0)
|
while (GetDataBlock (fd, (unsigned char *) buf) > 0)
|
||||||
{
|
{
|
||||||
if (!g_utf8_validate (buf, -1, NULL))
|
gchar *comment = (gchar *) buf;
|
||||||
|
|
||||||
|
if (!g_utf8_validate (comment, -1, NULL))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (comment_parasite)
|
if (comment_parasite)
|
||||||
|
@ -544,7 +546,7 @@ DoExtension (FILE *fd,
|
||||||
|
|
||||||
comment_parasite = gimp_parasite_new ("gimp-comment",
|
comment_parasite = gimp_parasite_new ("gimp-comment",
|
||||||
GIMP_PARASITE_PERSISTENT,
|
GIMP_PARASITE_PERSISTENT,
|
||||||
strlen (buf) + 1, buf);
|
strlen (comment) + 1, comment);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue