summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/queryloaders.c
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2003-11-14 23:28:01 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2003-11-14 23:28:01 +0000
commit8125e62dc44f126ae273526667ac290d96e63c9b (patch)
treef84d20b3a372b4eb7d35c7342f2d6196e6c8ba6a /gdk-pixbuf/queryloaders.c
parentac2ab7900913f5cef92da368eedd6efdfb228365 (diff)
downloadgdk-pixbuf-8125e62dc44f126ae273526667ac290d96e63c9b.tar.gz
Check that the mask is NULL or a string of the same length consisting
Sat Nov 15 00:26:19 2003 Matthias Clasen <maclas@gmx.de> * queryloaders.c (loader_sanity_check): Check that the mask is NULL or a string of the same length consisting entirely of ' ', '!', 'x', 'z', 'n'.
Diffstat (limited to 'gdk-pixbuf/queryloaders.c')
-rw-r--r--gdk-pixbuf/queryloaders.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index 0e1502a44..41c4c3669 100644
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -59,13 +59,32 @@ loader_sanity_check (const char *path, GdkPixbufFormat *info, GdkPixbufModule *v
const GdkPixbufModulePattern *pattern;
const char *error = "";
- for (pattern = info->signature; pattern->prefix; pattern++)
- if (strlen (pattern->prefix) == 0)
+ for (pattern = info->signature; pattern->prefix; pattern++)
+ {
+ int prefix_len = strlen (pattern->prefix);
+ if (prefix_len == 0)
{
error = "empty pattern";
goto error;
}
+ if (pattern->mask)
+ {
+ int mask_len = strlen (pattern->mask);
+ if (mask_len != prefix_len)
+ {
+ error = "mask length mismatch";
+
+ goto error;
+ }
+ if (strspn (pattern->mask, " !xzn") < mask_len)
+ {
+ error = "bad char in mask";
+
+ goto error;
+ }
+ }
+ }
if (!vtable->load && !vtable->begin_load && !vtable->load_animation)
{