[genius] Wed Dec 23 14:09:21 2009 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit 0f0a5819dfa7067b1ae0224f69c7341b8b21e96d
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Wed Dec 23 14:09:25 2009 -0600

    Wed Dec 23 14:09:21 2009  Jiri (George) Lebl <jirka 5z com>
    
    	* src/graphing.c, src/util.c: fix use of strcpy

 ChangeLog      |    4 ++++
 src/graphing.c |    5 ++++-
 src/util.c     |   11 ++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 138aa05..1864fe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 23 14:09:21 2009  Jiri (George) Lebl <jirka 5z com>
+
+	* src/graphing.c, src/util.c: fix use of strcpy
+
 Thu Dec 10 17:00:49 2009  Jiri (George) Lebl <jirka 5z com>
 
 	* src/eval.c: fix matrix expansion.  After zeros were replaced
diff --git a/src/graphing.c b/src/graphing.c
index 3290d59..75d8857 100644
--- a/src/graphing.c
+++ b/src/graphing.c
@@ -2736,8 +2736,11 @@ label_func (int i, GelEFunc *func, const char *var, const char *name)
 		if (len > 2 &&
 		    text[0] == '(' &&
 		    text[len-1] == ')') {
+			char *s;
 			text[len-1] = '\0';
-			strcpy (text, &text[1]);
+			s = g_strdup (&text[1]);
+			g_free (text);
+			text = s;
 			len-=2;
 		}
 
diff --git a/src/util.c b/src/util.c
index 42c8eee..68c3743 100644
--- a/src/util.c
+++ b/src/util.c
@@ -46,12 +46,11 @@ gel_appendstr (char *s,const char *p)
 {
 	if (p == NULL || *p == '\0')
 		return s;
-	if (s) {
+	if (s != NULL) {
 		s = g_realloc (s, strlen(s)+strlen(p)+1);
 		strcat(s,p);
 	} else {
-		s=(char*)g_malloc(strlen(p)+1);
-		strcpy(s,p);
+		s = g_strdup (p);
 	}
 	return s;
 }
@@ -63,16 +62,14 @@ gel_prependstr(char *s,const char *p)
 	char *p2;
 	if (p == NULL || *p == '\0')
 		return s;
-	if(s) {
+	if (s != NULL) {
 		p2=(char *)g_malloc(strlen(s)+strlen(p)+1);
 		strcpy(p2,p);
 		strcat(p2,s);
 		g_free(s);
 		return p2;
 	}
-	s=(char*)g_malloc(strlen(p)+1);
-	strcpy(s,p);
-	return s;
+	return g_strdup (p);
 }