Re: "git stash list" shows HEAD reflog
- From
- Pete Harlan <pgit@pcharlan.com>
- Date
- Mar 13, 2010, 21:43 UTC
- Message-ID
- <4B9C0713.30407@pcharlan.com>
- In-Reply-To
- <4B9BCD6E.4090902@lsrfire.ath.cx>
On 03/13/2010 09:37 AM, René Scharfe wrote:
> As Vladimir reported, "git log -g refs/stash" surprisingly showed the reflog > of HEAD if the message in the reflog file was too long. To fix this, convert > for_each_recent_reflog_ent() to use strbuf_getwholeline() instead of fgets(), > for safety and to avoid any size limits for reflog entries.
Was the old code actually unsafe? If not, then perhaps the commit message would be clearer if ", for safety and" were removed.
--Pete
Show 73 quoted lines
> Also reverse the logic of the part of the function that only looks at file
> tails. It used to close the file if fgets() succeeded. The following
> fgets() call in the while loop was likely to fail in this case, too, so
> passing an offset to for_each_recent_reflog_ent() never worked. Change it to
> error out if strbuf_getwholeline() fails instead.
>
> Reported-by: Vladimir Panteleev <vladimir@thecybershadow.net>
> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
> ---
> refs.c | 22 ++++++++++++----------
> 1 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index f3fcbe0..63e30d7 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1574,7 +1574,7 @@ int for_each_recent_reflog_ent(const char *ref, each_reflog_ent_fn fn, long ofs,
> {
> const char *logfile;
> FILE *logfp;
> - char buf[1024];
> + struct strbuf sb = STRBUF_INIT;
> int ret = 0;
>
> logfile = git_path("logs/%s", ref);
> @@ -1587,24 +1587,24 @@ int for_each_recent_reflog_ent(const char *ref, each_reflog_ent_fn fn, long ofs,
> if (fstat(fileno(logfp), &statbuf) ||
> statbuf.st_size < ofs ||
> fseek(logfp, -ofs, SEEK_END) ||
> - fgets(buf, sizeof(buf), logfp)) {
> + strbuf_getwholeline(&sb, logfp, '\n')) {
> fclose(logfp);
> + strbuf_release(&sb);
> return -1;
> }
> }
>
> - while (fgets(buf, sizeof(buf), logfp)) {
> + while (!strbuf_getwholeline(&sb, logfp, '\n')) {
> unsigned char osha1[20], nsha1[20];
> char *email_end, *message;
> unsigned long timestamp;
> - int len, tz;
> + int tz;
>
> /* old SP new SP name <email> SP time TAB msg LF */
> - len = strlen(buf);
> - if (len < 83 || buf[len-1] != '\n' ||
> - get_sha1_hex(buf, osha1) || buf[40] != ' ' ||
> - get_sha1_hex(buf + 41, nsha1) || buf[81] != ' ' ||
> - !(email_end = strchr(buf + 82, '>')) ||
> + if (sb.len < 83 || sb.buf[sb.len - 1] != '\n' ||
> + get_sha1_hex(sb.buf, osha1) || sb.buf[40] != ' ' ||
> + get_sha1_hex(sb.buf + 41, nsha1) || sb.buf[81] != ' ' ||
> + !(email_end = strchr(sb.buf + 82, '>')) ||
> email_end[1] != ' ' ||
> !(timestamp = strtoul(email_end + 2, &message, 10)) ||
> !message || message[0] != ' ' ||
> @@ -1618,11 +1618,13 @@ int for_each_recent_reflog_ent(const char *ref, each_reflog_ent_fn fn, long ofs,
> message += 6;
> else
> message += 7;
> - ret = fn(osha1, nsha1, buf+82, timestamp, tz, message, cb_data);
> + ret = fn(osha1, nsha1, sb.buf + 82, timestamp, tz, message,
> + cb_data);
> if (ret)
> break;
> }
> fclose(logfp);
> + strbuf_release(&sb);
> return ret;
> }
>