2006-04-05 Jim Evins <evins@snaught.com>

	* src/object-editor.c: (gl_object_editor_set_key_names):
		Fixed potential crash when freeing empty key list.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@588 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 982a52ebcbf23c56910db97d299f510566d67462..b43095ef7417994db24763b45fdba878c5e26539 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-05  Jim Evins  <evins@snaught.com>
+
+       * src/object-editor.c: (gl_object_editor_set_key_names):
+               Fixed potential crash when freeing empty key list.
+
 2006-03-11  Jim Evins  <evins@snaught.com>
 
        * src/print.c: (draw_text_object):

diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c
index f8652f2c7019fb8b67f7ab294da8ef3a100a5343..9507ccbb35bd26991cded580583b4d876c98bccc 100644 (file)
--- a/glabels2/src/object-editor.c
+++ b/glabels2/src/object-editor.c
@@ -526,7 +526,7 @@ gl_object_editor_set_key_names (glObjectEditor      *editor,
 
         keys = gl_merge_get_key_list (merge);
         if ( keys == NULL ) {
-                keys = g_list_append (keys, "");
+                keys = g_list_append (keys, g_strdup (""));
        }
 
        combo = editor->priv->img_key_combo;