uniconv: improve error checking

1 files changed, 3 insertions, 2 deletions

diff --git a/uniconv.c b/uniconv.c
index 9987130..d38269e 100644
--- a/uniconv.c
+++ b/uniconv.c
@@ -103,14 +103,14 @@ uniconv_conv(uniconv_t *uc,
 	return UNICONV_EBADF;
 
     /* reset converter */
-    if (!inbuf && !outbuf) {
+    if ((!inbuf || !(*inbuf)) && (!outbuf || !(*outbuf))) {
 	converter_reset(uc->from);
 	converter_reset(uc->to);
 	return UNICONV_SUCCESS;
     }
 
     /* converting/pushing input data */
-    if (inbuf) {
+    if (inbuf && *inbuf) {
 	uc_char_t ucs4;
 	uc_char_t *ucsbuf;
 
@@ -143,6 +143,7 @@ uniconv_conv(uniconv_t *uc,
 	}
     } else {
 	/* converting pending data in buffer */
+	assert (outbuf && *outbuf);
 	saved_inbuf = NULL;
 	saved_outbuf = *outbuf;
 	ret = uc->to->encode(uc->to, NULL, 0, outbuf, *outleft);