From 454d4a69a2f88d5d16c5f4fb8ab12a2474c1e06b Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 18 Nov 2008 16:24:31 +0000 Subject: [PATCH] * clutter/cogl/common/cogl-mesh.c: Re-works validate_custom_attribute_name() so it doesn't access an un-initialised variable. --- common/cogl-mesh.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/cogl-mesh.c b/common/cogl-mesh.c index c5e4bafec..16a4db16a 100644 --- a/common/cogl-mesh.c +++ b/common/cogl-mesh.c @@ -300,7 +300,6 @@ validate_custom_attribute_name (const char *attribute_name) { char *detail_seperator = NULL; int name_len; - const char *p; int i; detail_seperator = strstr (attribute_name, "::"); @@ -309,11 +308,13 @@ validate_custom_attribute_name (const char *attribute_name) else name_len = strlen (attribute_name); - if (name_len == 0 || !g_ascii_isalpha (*p) || *p != '_') + if (name_len == 0 + || !g_ascii_isalpha (attribute_name[0]) + || attribute_name[0] != '_') return FALSE; for (i = 1; i < name_len; i++) - if (!g_ascii_isalnum (*p) || *p != '_') + if (!g_ascii_isalnum (attribute_name[i]) || attribute_name[i] != '_') return FALSE; return TRUE;