From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Koegler Subject: [PATCH 1/2] parse_commit_buffer: don't parse invalid commits Date: Sun, 13 Jan 2008 19:11:09 +0100 Message-ID: <12002478702664-git-send-email-mkoegler@auto.tuwien.ac.at> Cc: git@vger.kernel.org, Martin Koegler To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Jan 13 19:11:57 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JE7JH-00008V-S6 for gcvg-git-2@gmane.org; Sun, 13 Jan 2008 19:11:52 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbYAMSLQ (ORCPT ); Sun, 13 Jan 2008 13:11:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753174AbYAMSLO (ORCPT ); Sun, 13 Jan 2008 13:11:14 -0500 Received: from thor.auto.tuwien.ac.at ([128.130.60.15]:35897 "EHLO thor.auto.tuwien.ac.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585AbYAMSLM (ORCPT ); Sun, 13 Jan 2008 13:11:12 -0500 Received: from localhost (localhost [127.0.0.1]) by thor.auto.tuwien.ac.at (Postfix) with ESMTP id 843BF680BED6; Sun, 13 Jan 2008 19:11:10 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at auto.tuwien.ac.at Received: from thor.auto.tuwien.ac.at ([127.0.0.1]) by localhost (thor.auto.tuwien.ac.at [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7IKPlqYIlITC; Sun, 13 Jan 2008 19:11:10 +0100 (CET) Received: by thor.auto.tuwien.ac.at (Postfix, from userid 3001) id 694A5680067C; Sun, 13 Jan 2008 19:11:10 +0100 (CET) X-Mailer: git-send-email 1.5.3.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Martin Koegler --- commit.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/commit.c b/commit.c index f074811..5b52daa 100644 --- a/commit.c +++ b/commit.c @@ -48,22 +48,34 @@ struct commit *lookup_commit(const unsigned char *sha1) return check_commit(obj, sha1, 0); } -static unsigned long parse_commit_date(const char *buf) +static int parse_commit_date(const char *buf, const char *tail, unsigned long *date) { - unsigned long date; + const char *dateptr; + if (buf + 6 >= tail) + return 0; if (memcmp(buf, "author", 6)) return 0; - while (*buf++ != '\n') + while (buf < tail && *buf++ != '\n') /* nada */; + if (buf + 9 >= tail) + return 0; if (memcmp(buf, "committer", 9)) return 0; - while (*buf++ != '>') + while (buf < tail && *buf++ != '>') /* nada */; - date = strtoul(buf, NULL, 10); - if (date == ULONG_MAX) - date = 0; - return date; + if (buf >= tail) + return 0; + dateptr = buf; + while (buf < tail && *buf++ != '\n') + /* nada */; + if (buf >= tail) + return 0; + /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */ + *date = strtoul(dateptr, NULL, 10); + if (*date == ULONG_MAX) + *date = 0; + return 1; } static struct commit_graft **commit_graft; @@ -236,9 +248,9 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size) return 0; item->object.parsed = 1; tail += size; - if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5)) + if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n') return error("bogus commit object %s", sha1_to_hex(item->object.sha1)); - if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0) + if (get_sha1_hex(bufptr + 5, parent) < 0) return error("bad tree pointer in commit %s", sha1_to_hex(item->object.sha1)); item->tree = lookup_tree(parent); @@ -275,7 +287,8 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size) n_refs++; } } - item->date = parse_commit_date(bufptr); + if (!parse_commit_date(bufptr, tail, &item->date)) + return error("bogus commit date in object %s", sha1_to_hex(item->object.sha1)); if (track_object_refs) { unsigned i = 0; -- 1.4.4.4