summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo J. A. M. Carneiro <gjc@src.gnome.org>2006-07-13 10:08:35 +0000
committerGustavo J. A. M. Carneiro <gjc@src.gnome.org>2006-07-13 10:08:35 +0000
commit38f8e8d7ed79a12ac561b28b4baa2e43dbb3585d (patch)
tree47a427d079e32c027366f5115b37937b34f3fffc
parent3bd20fd42ba96ab19ea217d7b224c766d00cc06a (diff)
downloadpygobject-38f8e8d7ed79a12ac561b28b4baa2e43dbb3585d.tar.gz
pygobject-38f8e8d7ed79a12ac561b28b4baa2e43dbb3585d.tar.xz
pygobject-38f8e8d7ed79a12ac561b28b4baa2e43dbb3585d.zip
goption leak fixed
-rw-r--r--ChangeLog7
-rw-r--r--gobject/pygoptioncontext.c4
-rw-r--r--m4/python.m42
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f317205..6f6b23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-13 Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
+
+ * m4/python.m4: Properly quote AM_CHECK_PYMOD definition.
+
+ * gobject/pygoptioncontext.c (pyg_option_context_parse): Fix mem
+ leak.
+
2006-07-12 Johan Dahlin <jdahlin@async.com.br>
* Makefile.am:
diff --git a/gobject/pygoptioncontext.c b/gobject/pygoptioncontext.c
index c58c410..7996fb6 100644
--- a/gobject/pygoptioncontext.c
+++ b/gobject/pygoptioncontext.c
@@ -108,7 +108,7 @@ pyg_option_context_parse(PyGOptionContext *self,
if (!result)
{
- g_free(argv_content);
+ g_strfreev(argv_content);
g_strfreev(original);
pyg_error_check(&error);
return NULL;
@@ -122,7 +122,7 @@ pyg_option_context_parse(PyGOptionContext *self,
}
g_strfreev(original);
- g_free(argv_content);
+ g_strfreev(argv_content);
return new_argv;
}
diff --git a/m4/python.m4 b/m4/python.m4
index a1396df..e1c5266 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -1,7 +1,7 @@
## this one is commonly used with AM_PATH_PYTHONDIR ...
dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN(AM_CHECK_PYMOD,
+AC_DEFUN([AM_CHECK_PYMOD],
[AC_REQUIRE([AM_PATH_PYTHON])
py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)