|
@@ -98,19 +98,25 @@ static int strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap)
|
|
|
|
|
|
va_copy(ap_saved, ap);
|
|
|
len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
|
|
|
- if (len < 0)
|
|
|
+ if (len < 0) {
|
|
|
+ va_end(ap_saved);
|
|
|
return len;
|
|
|
+ }
|
|
|
if (len > strbuf_avail(sb)) {
|
|
|
ret = strbuf_grow(sb, len);
|
|
|
- if (ret)
|
|
|
+ if (ret) {
|
|
|
+ va_end(ap_saved);
|
|
|
return ret;
|
|
|
+ }
|
|
|
len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap_saved);
|
|
|
va_end(ap_saved);
|
|
|
if (len > strbuf_avail(sb)) {
|
|
|
pr_debug("this should not happen, your vsnprintf is broken");
|
|
|
+ va_end(ap_saved);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
}
|
|
|
+ va_end(ap_saved);
|
|
|
return strbuf_setlen(sb, sb->len + len);
|
|
|
}
|
|
|
|