seahorse r2882 - in trunk: . libseahorse ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Mar  3 05:00:07 2009
New Revision: 2882
URL: http://svn.gnome.org/viewvc/seahorse?rev=2882&view=rev

Log:
Read out memory properly from GString.

Fixes bug #551753

Also add some null checks.

Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-util.c
   trunk/ssh/seahorse-ssh-key-data.c

Modified: trunk/libseahorse/seahorse-util.c
==============================================================================
--- trunk/libseahorse/seahorse-util.c	(original)
+++ trunk/libseahorse/seahorse-util.c	Tue Mar  3 05:00:07 2009
@@ -265,8 +265,7 @@
 	if (len)
 		*len = string->len;
     
-	text = string->str;
-	g_string_free (string, FALSE);
+	text = g_string_free (string, FALSE);
 	g_free (buffer);
 	
 	return (guchar*)text;

Modified: trunk/ssh/seahorse-ssh-key-data.c
==============================================================================
--- trunk/ssh/seahorse-ssh-key-data.c	(original)
+++ trunk/ssh/seahorse-ssh-key-data.c	Tue Mar  3 05:00:07 2009
@@ -231,7 +231,12 @@
     gchar **lines, **l;
     gchar *line;
     
-    lines = g_strsplit (data, "\n", -1);
+    g_return_val_if_fail (data, 0);
+    
+    if (!*data)
+	    return 0;
+    
+    lines = g_strsplit (data, "\n", 0);
     for (l = lines; *l; l++) {
         
         line = *l;