Merging JSON branch. It's very stable by now, and I want more testers.

1 files changed, 4 insertions, 0 deletions

diff --git a/nick.c b/nick.c
index 0d394ecb..4b7e71d0 100644
--- a/nick.c
+++ b/nick.c
@@ -133,7 +133,10 @@ char *nick_gen( bee_user_t *bu )
 			{
 				chop = fmt[1];
 				if( chop == '\0' )
+				{
+					g_string_free( ret, TRUE );
 					return NULL;
+				}
 				fmt += 2;
 			}
 			else if( isdigit( *fmt ) )
@@ -186,6 +189,7 @@ char *nick_gen( bee_user_t *bu )
 			}
 			else
 			{
+				g_string_free( ret, TRUE );
 				return NULL;
 			}
 		}