From dev-return-53292-apmail-httpd-dev-archive=httpd.apache.org@httpd.apache.org Thu May 04 17:18:11 2006 Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 33031 invoked from network); 4 May 2006 17:18:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 May 2006 17:18:06 -0000 Received: (qmail 35687 invoked by uid 500); 4 May 2006 17:18:00 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 35669 invoked by uid 500); 4 May 2006 17:18:00 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 35658 invoked by uid 99); 4 May 2006 17:17:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 10:17:59 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [206.47.199.141] (HELO simmts12-srv.bellnexxia.net) (206.47.199.141) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 10:17:59 -0700 Received: from [192.168.0.103] ([65.95.230.168]) by simmts12-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20060504171738.ICZN29039.simmts12-srv.bellnexxia.net@[192.168.0.103]>; Thu, 4 May 2006 13:17:38 -0400 Message-ID: <445A3739.7080406@pearsoncmg.com> Date: Thu, 04 May 2006 13:17:45 -0400 From: Chris Darroch Organization: Pearson CTG/CMG User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.13) Gecko/20060423 X-Accept-Language: en-ca, en-us MIME-Version: 1.0 To: dev@httpd.apache.org Subject: [PATCH 1/6] scoreboard over-sized X-Enigmail-Version: 0.93.0.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Hi -- It looks to me like the memory allocated for ap_scoreboard_image is a little bit over-sized. In r104404 the lb_score elements were added to the scoreboard in the manner of the worker_score array, and then in r105134 much of this was reversed, but the call to calloc() still sizes ap_scoreboard_image as if a two-dimensional array was required. Chris. ===================================================================== --- server/scoreboard.c.orig 2006-05-02 09:52:09.803650679 -0400 +++ server/scoreboard.c 2006-05-03 10:17:13.273161088 -0400 @@ -117,8 +117,7 @@ ap_calc_scoreboard_size(); ap_scoreboard_image = - calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *) + - server_limit * lb_limit * sizeof(lb_score *)); + calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *)); more_storage = shared_score; ap_scoreboard_image->global = (global_score *)more_storage; more_storage += sizeof(global_score);