summaryrefslogtreecommitdiffstats
path: root/src/recode.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/recode.c')
-rw-r--r--src/recode.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/recode.c b/src/recode.c
index 9e19078..8c6cc40 100644
--- a/src/recode.c
+++ b/src/recode.c
@@ -511,17 +511,20 @@ rcc_string rccSizedFrom(rcc_context ctx, rcc_class_id class_id, const char *buf,
}
}
else icnv = ctx->iconv_from[class_id];
-
+
if (icnv) {
ret = rccIConvInternal(ctx, icnv, buf, len);
- if (ret == (size_t)-1) return NULL;
+ if (ret == (size_t)-1) {
+ rccMutexUnLock(ctx->mutex);
+ return NULL;
+ }
if ((rccGetOption(ctx, RCC_OPTION_TRANSLATE))&&(rccGetClassType(ctx, class_id) == RCC_CLASS_TRANSLATE_FROM)) {
config = rccGetCurrentConfig(ctx);
translate = rccRecodeTranslate(&config , class_id, ctx->tmpbuffer);
if (translate) language_id = rccConfigGetLanguage(config);
}
-
+
result = rccCreateString(language_id, translate?translate:ctx->tmpbuffer, translate?0:ret);
} else {
if ((rccGetOption(ctx, RCC_OPTION_TRANSLATE))&&(rccGetClassType(ctx, class_id) == RCC_CLASS_TRANSLATE_FROM)) {