From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] strbuf: allocate enough space when strbuf_setlen() is called first time
Date: Tue, 26 Apr 2011 22:09:33 +0700 [thread overview]
Message-ID: <20110426150933.GA29121@do> (raw)
In-Reply-To: <1303820660-744-1-git-send-email-pclouds@gmail.com>
On Tue, Apr 26, 2011 at 07:24:20PM +0700, Nguyễn Thái Ngọc Duy wrote:
> static inline void strbuf_setlen(struct strbuf *sb, size_t len) {
> if (!sb->alloc)
> - strbuf_grow(sb, 0);
> + strbuf_grow(sb, len);
> assert(len < sb->alloc);
> sb->len = len;
> sb->buf[len] = '\0';
This should be better. But I fail to see why it corrupts memory :(
@@ -33,9 +33,8 @@ static inline size_t strbuf_avail(const struct strbuf *sb) {
extern void strbuf_grow(struct strbuf *, size_t);
static inline void strbuf_setlen(struct strbuf *sb, size_t len) {
- if (!sb->alloc)
- strbuf_grow(sb, 0);
- assert(len < sb->alloc);
+ if (sb->alloc < len + 1)
+ strbuf_grow(sb, len - sb->alloc);
sb->len = len;
sb->buf[len] = '\0';
}
--
Duy
next prev parent reply other threads:[~2011-04-26 15:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-26 12:24 [PATCH] strbuf: allocate enough space when strbuf_setlen() is called first time Nguyễn Thái Ngọc Duy
2011-04-26 15:09 ` Nguyen Thai Ngoc Duy [this message]
2011-04-26 15:25 ` Junio C Hamano
2011-04-26 15:32 ` Nguyen Thai Ngoc Duy
2011-04-26 16:54 ` René Scharfe
2011-04-26 17:18 ` Junio C Hamano
2011-04-26 21:26 ` René Scharfe
2011-04-26 21:51 ` Junio C Hamano
2011-04-27 17:24 ` René Scharfe
2011-04-28 16:57 ` Junio C Hamano
2011-04-27 0:12 ` Nguyen Thai Ngoc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110426150933.GA29121@do \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).