diff --git a/libisofs/util.c b/libisofs/util.c
index 7778455..d642ccc 100644
--- a/libisofs/util.c
+++ b/libisofs/util.c
@@ -603,7 +603,9 @@ int str2ucs(const char *icharset, const char *input, uint16_t **output)
         conv_ret = iso_iconv_open(&conv, "UCS-2BE", "WCHAR_T", 0);
         if (conv_ret <= 0) {
             free(wsrc_);
+            wsrc_ = NULL;
             free(ret_);
+            ret = ret_ = NULL;
         }
     } else if (result != (int) ISO_CHARSET_CONV_ERROR)
         return result;