s3-talloc Change TALLOC_ZERO_P() to talloc_zero()

[nivanova/samba-autobuild/.git] / source3 / lib / dprintf.c

diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index 631c45a8078890be0cecdf95445f8d256296515e..ad3c79a8d521bee6a0425ab78288c4ba335ceb52 100644 (file)
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -29,11 +29,13 @@
 */
 
 #include "includes.h"
+#include "intl/lang_tdb.h"
 
  int d_vfprintf(FILE *f, const char *format, va_list ap)
 {
        char *p = NULL, *p2 = NULL;
        int ret, maxlen, clen;
+       size_t size = 0;
        const char *msgstr;
        va_list ap2;
 
@@ -65,7 +67,11 @@ again:
                goto out;
        }
 
-       clen = convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, True);
+       if (!convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, &size)) {
+               ret = -1;
+               goto out;
+       }
+       clen = size;
 
        if (clen >= maxlen) {
                /* it didn't fit - try a larger buffer */