From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: 1.5.3-rc5 regression on OS X? Date: Wed, 15 Aug 2007 15:42:49 -0700 Message-ID: <7vfy2ko1w6.fsf@gitster.siamese.dyndns.org> References: <600399.61066.qm@web52807.mail.re2.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Perrin Meyer X-From: git-owner@vger.kernel.org Thu Aug 16 00:43:11 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1ILRa2-0004JD-Ry for gcvg-git@gmane.org; Thu, 16 Aug 2007 00:43:11 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936844AbXHOWnI (ORCPT ); Wed, 15 Aug 2007 18:43:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S936065AbXHOWnG (ORCPT ); Wed, 15 Aug 2007 18:43:06 -0400 Received: from rune.sasl.smtp.pobox.com ([208.210.124.37]:46533 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935763AbXHOWnD (ORCPT ); Wed, 15 Aug 2007 18:43:03 -0400 Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by rune.sasl.smtp.pobox.com (Postfix) with ESMTP id E1F6B121FEF; Wed, 15 Aug 2007 18:43:19 -0400 (EDT) In-Reply-To: <600399.61066.qm@web52807.mail.re2.yahoo.com> (Perrin Meyer's message of "Wed, 15 Aug 2007 14:19:47 -0700 (PDT)") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Does this help? --- builtin-read-tree.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 1967d10..5b07e9a 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -96,7 +96,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) { int i, newfd, stage = 0; unsigned char sha1[20]; - struct tree_desc t[3]; + struct tree_desc t[20]; struct unpack_trees_options opts; memset(&opts, 0, sizeof(opts)); @@ -263,6 +263,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) opts.head_idx = 1; } + if (ARRAY_SIZE(t) < nr_trees) + die("I cannot read more than %d trees", ARRAY_SIZE(t)); + for (i = 0; i < nr_trees; i++) { struct tree *tree = trees[i]; parse_tree(tree);