gEDA-cvs: branch: master updated (1.1.1.20070708-27-g305c10f)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  305c10f50464f02e32d84140db69f158da6e4c47 (commit)
      from  f6e43346086f118dbae33e7cb650c4eef90ee3aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 libgeda/src/g_rc.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)


=================
 Commit Messages
=================

commit 305c10f50464f02e32d84140db69f158da6e4c47
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Wed Jul 25 00:52:36 2007 +0100

    Free strings from scm_to_locale_string() with free(), not g_free()
    
    NB: All other code in geda uses g_strdup (SCM_STRING_CHARS (...)) to
    convert strings from guile, so is not affected.

:100644 100644 d23cb9b... 90ec84f... M	libgeda/src/g_rc.c

=========
 Changes
=========

commit 305c10f50464f02e32d84140db69f158da6e4c47
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Wed Jul 25 00:52:36 2007 +0100

    Free strings from scm_to_locale_string() with free(), not g_free()
    
    NB: All other code in geda uses g_strdup (SCM_STRING_CHARS (...)) to
    convert strings from guile, so is not affected.

diff --git a/libgeda/src/g_rc.c b/libgeda/src/g_rc.c
index d23cb9b..90ec84f 100644
--- a/libgeda/src/g_rc.c
+++ b/libgeda/src/g_rc.c
@@ -411,18 +411,26 @@ SCM g_rc_component_library_command (SCM listcmd, SCM getcmd,
   gchar *lcmdstr = NULL;
   gchar *gcmdstr = NULL;
   const CLibSource *src;
+  char *tmp_str;
+
   SCM_ASSERT (scm_is_string (listcmd), listcmd, SCM_ARG1, 
-	      "component-library-command");
-  lcmdstr = scm_to_locale_string (listcmd);
+              "component-library-command");
+  tmp_str = scm_to_locale_string (listcmd);
+  lcmdstr = g_strdup (tmp_str);
+  free (tmp_str);
 
   SCM_ASSERT (scm_is_string (getcmd), getcmd, SCM_ARG2, 
-	      "component-library-command");
-  gcmdstr = scm_to_locale_string (getcmd);
+              "component-library-command");
+  tmp_str = scm_to_locale_string (getcmd);
+  gcmdstr = g_strdup (tmp_str);
+  free (tmp_str);
 
   SCM_ASSERT (scm_is_string (name), name, SCM_ARG3, 
-	      "component-library-command");
-  namestr = scm_to_locale_string (name);
-  
+              "component-library-command");
+  tmp_str = scm_to_locale_string (name);
+  namestr = g_strdup (tmp_str);
+  free (tmp_str);
+
   /* take care of any shell variables */
   /*! \bug this may be a security risk! */
   lcmdstr = expand_env_variables(lcmdstr);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs