--- abiword-2.5.1/src/af/util/xp/ut_iconv.cpp~ 2007-01-16 15:13:29.000000000 -0800 +++ abiword-2.5.1/src/af/util/xp/ut_iconv.cpp 2007-08-08 13:35:34.000000000 -0700 @@ -401,7 +401,7 @@ size_t outbuf_size = ((len + 3) & ~3) + 15; size_t outbytes_remaining = outbuf_size - 4; /* -4 for null (allow for ucs4 0) */ - char* pDest = static_cast(g_try_malloc(outbuf_size)); + char* pDest = static_cast(g_try_malloc(outbuf_size)); //FIXME: what if pDest = NULL? char* outp = pDest; bool have_error = false; @@ -434,7 +434,7 @@ if (used + 16 > outbuf_size) { outbuf_size = outbuf_size + 15; - pDest = static_cast(g_try_realloc(pDest, outbuf_size)); + pDest = static_cast(g_try_realloc(pDest, outbuf_size)); //FIXME: what if pDest = NULL? outp = pDest + used; outbytes_remaining = outbuf_size - used - 4; /* -1 for nul */