Index: appmap-gen.c
===================================================================
RCS file: /cvs/ldtp/appmap/appmap-gen.c,v
retrieving revision 1.8
diff -u -p -r1.8 appmap-gen.c
--- appmap-gen.c        11 Oct 2005 11:36:48 -0000      1.8
+++ appmap-gen.c        12 Oct 2005 11:53:33 -0000
@@ -747,12 +747,17 @@ void insert_context_header (FILE *fp, Ac
       else
        stripped_data = g_strdup (label);
       if (strchr (stripped_data, '.'))
-       tmp_data = strip_delim (stripped_data, '.');
+       tmp_data = strip_delim (stripped_data, '.');
       else
        tmp_data = g_strdup (stripped_data);
       name = g_strdup_printf ("%s%s", cur_obj_info->prefix, tmp_data);
       g_free (tmp_data);
       g_free (stripped_data);
+      g_free (label);
+      g_free (cur_obj_info->object_type);
+      g_free (cur_obj_info->prefix);
+      g_free (cur_obj_info);
+
     }
   else
     {
@@ -760,7 +765,6 @@ void insert_context_header (FILE *fp, Ac
        * TODO: Handle the case of window label being NULL
        */
       g_print ("Found window with label value as NULL!!");
-      g_free (label);
       g_free (object_record);
       g_free (cur_obj_info->object_type);
       g_free (cur_obj_info->prefix);
@@ -770,12 +774,8 @@ void insert_context_header (FILE *fp, Ac
   size = strlen (object_record);
   fwrite (object_record, sizeof (char), size, fp);

-  g_free (label);
   g_free (name);
   g_free (object_record);
-  g_free (cur_obj_info->object_type);
-  g_free (cur_obj_info->prefix);
-  g_free (cur_obj_info);
 }

 void create_appmap (FILE *fp, Accessible *accessible, char *application_name)