git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Martin Koegler <mkoegler@auto.tuwien.ac.at>
Subject: [PATCH 01/12] read_object_with_reference: don't read beyond the buffer
Date: Mon, 18 Feb 2008 21:47:52 +0100	[thread overview]
Message-ID: <12033676833730-git-send-email-mkoegler@auto.tuwien.ac.at> (raw)

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
 sha1_file.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index 4179949..d9da7c8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1943,7 +1943,8 @@ void *read_object_with_reference(const unsigned char *sha1,
 		}
 		ref_length = strlen(ref_type);
 
-		if (memcmp(buffer, ref_type, ref_length) ||
+		if (ref_length + 40 > isize ||
+		    memcmp(buffer, ref_type, ref_length) ||
 		    get_sha1_hex((char *) buffer + ref_length, actual_sha1)) {
 			free(buffer);
 			return NULL;
-- 
1.5.4.1.g96b77

             reply	other threads:[~2008-02-18 20:49 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-18 20:47 Martin Koegler [this message]
2008-02-18 20:47 ` [PATCH 02/12] get_sha1_oneline: check return value of parse_object Martin Koegler
2008-02-18 20:47   ` [PATCH 03/12] mark_blob/tree_uninteresting: check for NULL Martin Koegler
2008-02-18 20:47     ` [PATCH 04/12] add_one_tree: handle NULL from lookup_tree Martin Koegler
2008-02-18 20:47       ` [PATCH 05/12] process_tree/blob: check for NULL Martin Koegler
2008-02-18 20:47         ` [PATCH 06/12] check results of parse_commit in merge_bases Martin Koegler
2008-02-18 20:47           ` [PATCH 07/12] peel_onion: handle NULL Martin Koegler
2008-02-18 20:47             ` [PATCH 08/12] process_tag: handle tag->tagged == NULL Martin Koegler
2008-02-18 20:48               ` [PATCH 09/12] process_tree/blob: check for NULL Martin Koegler
2008-02-18 20:48                 ` [PATCH 10/12] revision.c: handle tag->tagged == NULL Martin Koegler
2008-02-18 20:48                   ` [PATCH 11/12] parse_commit: don't fail, if object is NULL Martin Koegler
2008-02-18 20:48                     ` [PATCH 12/12] check return value from parse_commit Martin Koegler
2008-02-19 21:31         ` [PATCH 05/12] process_tree/blob: check for NULL Junio C Hamano

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=12033676833730-git-send-email-mkoegler@auto.tuwien.ac.at \
    --to=mkoegler@auto.tuwien.ac.at \
    --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).