From 9e7bca777f3d5a7108fc06b203fbf890848be8b3 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 21 May 2007 11:51:01 +0000 Subject: [PATCH] Fixed missing yaz_iconv reset call in odr_iconv_string in decoding phase. --- src/odr_oct.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/odr_oct.c b/src/odr_oct.c index c4ef168..5dd02bb 100644 --- a/src/odr_oct.c +++ b/src/odr_oct.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: odr_oct.c,v 1.12 2007-05-02 11:31:59 adam Exp $ + * $Id: odr_oct.c,v 1.13 2007-05-21 11:51:01 adam Exp $ */ /** * \file odr_oct.c @@ -198,6 +198,13 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name) odr_seterror(o, ODATA, 45); return 0; } + ret = yaz_iconv(o->op->iconv_handle, 0, 0, + &outbuf, &outleft); + if (ret == (size_t)(-1)) + { + odr_seterror(o, ODATA, 45); + return 0; + } inleft = outbuf - (char*) *p; (*p)[inleft] = '\0'; /* null terminate it */ -- 1.7.10.4