Re: pradeeban - r26656 - in abiword/branches/gsoc2009unicode/src: af/util/xp wp/ap/xp

> Modified: abiword/branches/gsoc2009unicode/src/af/util/xp/ut_iconv.cpp
> ===================================================================
> --- abiword/branches/gsoc2009unicode/src/af/util/xp/ut_iconv.cpp        2009-05-31 07:25:47 UTC (rev 26655)
> +++ abiword/branches/gsoc2009unicode/src/af/util/xp/ut_iconv.cpp        2009-05-31 12:51:15 UTC (rev 26656)
> @@ -406,7 +406,7 @@
>
>        /* Due to a GLIBC bug, round outbuf_size up to a multiple of 4 */
>        /* + 1 for nul in case len == 1 */
> -       size_t outbuf_size = ((len + 3) & ~3) + 15;
> +       size_t outbuf_size = (((4*len) + 3) & ~3) + 15;
>        size_t outbytes_remaining = outbuf_size - 4; /* -4 for null (allow for ucs4 0) */
>
>        char* pDest = static_cast<char*>(g_try_malloc(outbuf_size));

Besides what Hub said, I made some changes to ut_iconv.cpp in TRUNK
that fix whatever issue you were running into. I don't want your
changes merged to the trunk, so maybe it'd be preferable if you could
copy ut_iconv.cpp from the trunk to your branch.

Thanks,
Dom
Received on Sun May 31 22:33:46 2009