From d7d24f55ee6b3a16654991f7fb45c564eb33a8bd Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 3 Feb 2011 14:18:16 -0600 Subject: [PATCH] util: Fix convert_utf8_to_gsm_best_lang logic --- src/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util.c b/src/util.c index 320d2e8a..53a6f59a 100644 --- a/src/util.c +++ b/src/util.c @@ -820,7 +820,7 @@ unsigned char *convert_utf8_to_gsm_best_lang(const char *utf8, long len, items_written, terminator, locking, single); if (encoded != NULL) - return encoded; + goto out; if (hint == GSM_DIALECT_DEFAULT) return NULL; @@ -830,7 +830,7 @@ unsigned char *convert_utf8_to_gsm_best_lang(const char *utf8, long len, items_written, terminator, locking, single); if (encoded != NULL) - return encoded; + goto out; /* Spanish dialect uses the default locking shift table */ if (hint == GSM_DIALECT_SPANISH) @@ -844,6 +844,7 @@ unsigned char *convert_utf8_to_gsm_best_lang(const char *utf8, long len, if (encoded == NULL) return NULL; +out: if (used_locking != NULL) *used_locking = locking;