[Guile-commits] GNU Guile branch, master, updated. v2.1.0-2-gbbabae9

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=bbabae997d7e83e0382d086ce2e0ed82b61c2a7e

The branch, master has been updated
       via  bbabae997d7e83e0382d086ce2e0ed82b61c2a7e (commit)
       via  4fbbf346a654e84f89008e1800e8f867fde57462 (commit)
      from  0858753e829fd399b55700688b4b2cb9c3ea6908 (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.

- Log -----------------------------------------------------------------
commit bbabae997d7e83e0382d086ce2e0ed82b61c2a7e
Merge: 0858753 4fbbf34
Author: Andy Wingo <address@hidden>
Date:   Wed Feb 8 12:25:10 2012 +0100

    Merge remote-tracking branch 'origin/stable-2.0'

-----------------------------------------------------------------------

Summary of changes:
 libguile/i18n.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libguile/i18n.c b/libguile/i18n.c
index 057711f..817c661 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -232,7 +232,8 @@ SCM_SMOB_FREE (scm_tc16_locale_smob_type, smob_locale_free, 
locale)
   scm_t_locale c_locale;
 
   c_locale = (scm_t_locale) SCM_SMOB_DATA (locale);
-  freelocale (c_locale);
+  if (c_locale)
+    freelocale (c_locale);
 
   return 0;
 }


hooks/post-receive
-- 
GNU Guile