diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-18 14:12:02 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-18 14:12:02 -0700 |
| commit | 716ddc2a897eacd08aed7ff4bee165e418ff63cc (patch) | |
| tree | 9f400d977baa55edc70fa39e1346fb2dda975a27 /source3/lib/dprintf.c | |
| parent | c6d58efa4b1ad5ff4a9e0f224b8a9789d8f82faf (diff) | |
| parent | c2139e8e5646a8558d70c1ca4ce2d755497de8e1 (diff) | |
| download | samba-716ddc2a897eacd08aed7ff4bee165e418ff63cc.tar.gz samba-716ddc2a897eacd08aed7ff4bee165e418ff63cc.tar.bz2 samba-716ddc2a897eacd08aed7ff4bee165e418ff63cc.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/lib/dprintf.c')
| -rw-r--r-- | source3/lib/dprintf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c index 631c45a807..835d34076e 100644 --- a/source3/lib/dprintf.c +++ b/source3/lib/dprintf.c @@ -66,6 +66,10 @@ again: } clen = convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, True); + if (clen == -1) { + ret = -1; + goto out; + } if (clen >= maxlen) { /* it didn't fit - try a larger buffer */ |