Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 90772 invoked from network); 12 Feb 2005 16:59:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Feb 2005 16:59:52 -0000 Received: (qmail 58851 invoked by uid 500); 12 Feb 2005 16:59:47 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 58829 invoked by uid 500); 12 Feb 2005 16:59:46 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 58816 invoked by uid 500); 12 Feb 2005 16:59:46 -0000 Received: (qmail 58813 invoked by uid 99); 12 Feb 2005 16:59:46 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 12 Feb 2005 08:59:46 -0800 Received: (qmail 90724 invoked by uid 1526); 12 Feb 2005 16:59:45 -0000 Date: 12 Feb 2005 16:59:45 -0000 Message-ID: <20050212165945.90723.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mturk 2005/02/12 08:59:45 Modified: jk/native/common jk_lb_worker.c Log: Check if malloc has failed before using that memory, not after. Revision Changes Path 1.45 +6 -5 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- jk_lb_worker.c 12 Feb 2005 11:32:12 -0000 1.44 +++ jk_lb_worker.c 12 Feb 2005 16:59:45 -0000 1.45 @@ -574,6 +574,11 @@ p->lb_workers = jk_pool_alloc(&p->p, num_of_workers * sizeof(worker_record_t)); + if (!p->lb_workers) { + JK_TRACE_EXIT(l); + return JK_FALSE; + } + for (i = 0; i < num_of_workers; i++) { p->lb_workers[i].s = jk_shm_alloc(&p->p, sizeof(jk_shm_worker_t)); if (p->lb_workers[i].s == NULL) { @@ -581,10 +586,6 @@ return JK_FALSE; } } - if (!p->lb_workers) { - JK_TRACE_EXIT(l); - return JK_FALSE; - } for (i = 0; i < num_of_workers; i++) { strncpy(p->lb_workers[i].s->name, worker_names[i], --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org