SF.net SVN: geany:[3241] trunk

[eht16 at users.sourceforge.net]

Revision: 3241
          http://geany.svn.sourceforge.net/geany/?rev=3241&view=rev
Author:   eht16
Date:     2008-11-16 17:55:23 +0000 (Sun, 16 Nov 2008)

Log Message:
-----------
When passing NULL to utils_str_replace(), also return NULL (fixes broken new file template list).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-16 17:55:05 UTC (rev 3240)
+++ trunk/ChangeLog	2008-11-16 17:55:23 UTC (rev 3241)
@@ -20,6 +20,9 @@
    to indicators for more consistency.
  * src/templates.c:
    Plug little memory leak.
+ * src/utils.c:
+   When passing NULL to utils_str_replace(), also return NULL
+   (fixes broken new file template list).
 
 
 2008-11-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2008-11-16 17:55:05 UTC (rev 3240)
+++ trunk/src/utils.c	2008-11-16 17:55:23 UTC (rev 3241)
@@ -504,7 +504,12 @@
  * See utils_string_replace_all() for details. */
 gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement)
 {
-	GString *str = g_string_new(haystack);
+	GString *str;
+	
+	if (haystack == NULL)
+		return NULL;
+		
+	str = g_string_new(haystack);
 
 	g_free(haystack);
 	utils_string_replace_all(str, needle, replacement);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.