diff options
Diffstat (limited to 'libkern/vsmprint.c')
| -rw-r--r-- | libkern/vsmprint.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libkern/vsmprint.c b/libkern/vsmprint.c index 44789be5..0e18fe44 100644 --- a/libkern/vsmprint.c +++ b/libkern/vsmprint.c @@ -20,6 +20,8 @@ fmtStrFlush(Fmt *f) char *s; int n; + if(f->start == nil) + return 0; n = (int)f->farg; n += 256; f->farg = (void*)n; @@ -41,7 +43,7 @@ fmtstrinit(Fmt *f) { int n; - f->runes = 0; + memset(f, 0, sizeof(*f)); n = 32; f->start = malloc(n); if(f->start == nil) @@ -65,10 +67,13 @@ vsmprint(char *fmt, va_list args) if(fmtstrinit(&f) < 0) return nil; - f.args = args; + va_copy(f.args, args); n = dofmt(&f, fmt); - if(n < 0) + va_end(f.args); + if(n < 0){ + free(f.start); + f.start = nil; return nil; - *(char*)f.to = '\0'; - return f.start; + } + return fmtstrflush(&f); } |