Index: branches/chucko/i386/libsaio/gma.c
===================================================================
--- branches/chucko/i386/libsaio/gma.c	(revision 2300)
+++ branches/chucko/i386/libsaio/gma.c	(revision 2301)
@@ -354,13 +354,11 @@
 	{
 		if (intel_gfx_chipsets[i].model == ((device_id << 16) | vendor_id))
 		{
-			sprintf(desc, "%s %s", INTEL_NAME, intel_gfx_chipsets[i].label_info);
-			desc[sizeof(desc) - 1] = '\0';
+            snprintf(desc, sizeof(desc), "%s %s", INTEL_NAME, intel_gfx_chipsets[i].label_info);
 			return desc;
 		}
 	}
-	sprintf(desc, "Unknown %s Graphics card", INTEL_NAME);
-	desc[sizeof(desc) - 1] = '\0';
+	snprintf(desc, sizeof(desc), "Unknown %s Graphics card", INTEL_NAME);
 	return desc;
 }
 
@@ -395,9 +393,7 @@
 		string = devprop_create_string();
 	}
 
-	struct DevPropDevice *device = malloc(sizeof(struct DevPropDevice));
-	device = devprop_add_device(string, devicepath);
-
+	struct DevPropDevice *device = devprop_add_device(string, devicepath);
 	if (!device)
 	{
 		printf("Failed initializing dev-prop string dev-entry.\n");