Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CF0B548FB for ; Sat, 21 May 2011 08:58:17 +0000 (UTC) Received: (qmail 18009 invoked by uid 500); 21 May 2011 08:58:12 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 17931 invoked by uid 500); 21 May 2011 08:58:12 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 17922 invoked by uid 99); 21 May 2011 08:58:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 May 2011 08:58:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 May 2011 08:58:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C50F8238890D; Sat, 21 May 2011 08:57:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1125651 - /tomcat/jk/trunk/native/common/jk_connect.c Date: Sat, 21 May 2011 08:57:48 -0000 To: dev@tomcat.apache.org From: timw@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110521085748.C50F8238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: timw Date: Sat May 21 08:57:48 2011 New Revision: 1125651 URL: http://svn.apache.org/viewvc?rev=1125651&view=rev Log: Switching read byte counters to unsigned types to ensure we don't get int wrapping when counting the bytes read. Previously MAX_LINGER_BYTES (32768) was > INT_MAX. Modified: tomcat/jk/trunk/native/common/jk_connect.c Modified: tomcat/jk/trunk/native/common/jk_connect.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1125651&r1=1125650&r2=1125651&view=diff ============================================================================== --- tomcat/jk/trunk/native/common/jk_connect.c (original) +++ tomcat/jk/trunk/native/common/jk_connect.c Sat May 21 08:57:48 2011 @@ -712,8 +712,8 @@ int jk_shutdown_socket(jk_sock_t sd, jk_ char buf[64]; char *sb = NULL; int rc = 0; - int rd = 0; - int rp = 0; + size_t rd = 0; + size_t rp = 0; int save_errno; int timeout = MS_TO_LINGER; time_t start = time(NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org