--- lib/charcnv.c.orig	2012-05-23 13:29:19.752130710 +0200
+++ lib/charcnv.c	2012-05-23 15:55:23.018978756 +0200
@@ -516,6 +516,10 @@
 
  again:
 
+        // bug #8373
+	if (strlen(inbuf) == 0) {
+	  i_len = 0;
+	}
 	retval = smb_iconv(descriptor,
 			   &inbuf, &i_len,
 			   &outbuf, &o_len);