diff options
Diffstat (limited to 'lib/talloc/talloc.c')
| -rw-r--r-- | lib/talloc/talloc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 1cb4d7dead..2a5406e11d 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -2356,11 +2356,11 @@ _PUBLIC_ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) int len; char *ret; va_list ap2; - char c; + char buf[1024]; /* this call looks strange, but it makes it work on older solaris boxes */ va_copy(ap2, ap); - len = vsnprintf(&c, 1, fmt, ap2); + len = vsnprintf(buf, sizeof(buf), fmt, ap2); va_end(ap2); if (unlikely(len < 0)) { return NULL; @@ -2369,9 +2369,13 @@ _PUBLIC_ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) ret = (char *)__talloc(t, len+1); if (unlikely(!ret)) return NULL; - va_copy(ap2, ap); - vsnprintf(ret, len+1, fmt, ap2); - va_end(ap2); + if (len < sizeof(buf)) { + memcpy(ret, buf, len+1); + } else { + va_copy(ap2, ap); + vsnprintf(ret, len+1, fmt, ap2); + va_end(ap2); + } _talloc_set_name_const(ret, ret); return ret; |