Merge branch 'ma/ts-cleanups' into maint

Assorted bugfixes and clean-ups.

* ma/ts-cleanups:
  ThreadSanitizer: add suppressions
  strbuf_setlen: don't write to strbuf_slopbuf
  pack-objects: take lock before accessing `remaining`
  convert: always initialize attr_action in convert_attrs
This commit is contained in:
Junio C Hamano
2017-10-23 14:19:02 +09:00
6 changed files with 37 additions and 3 deletions

View File

@ -154,7 +154,10 @@ static inline void strbuf_setlen(struct strbuf *sb, size_t len)
if (len > (sb->alloc ? sb->alloc - 1 : 0))
die("BUG: strbuf_setlen() beyond buffer");
sb->len = len;
sb->buf[len] = '\0';
if (sb->buf != strbuf_slopbuf)
sb->buf[len] = '\0';
else
assert(!strbuf_slopbuf[0]);
}
/**