Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A98518332 for ; Wed, 23 Sep 2015 11:52:27 +0000 (UTC) Received: (qmail 75946 invoked by uid 500); 23 Sep 2015 11:52:27 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 75917 invoked by uid 500); 23 Sep 2015 11:52:26 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 75907 invoked by uid 99); 23 Sep 2015 11:52:26 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2015 11:52:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 81DDAF6F98 for ; Wed, 23 Sep 2015 11:52:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 3.5 X-Spam-Level: *** X-Spam-Status: No, score=3.5 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RDNS_NONE=2.5] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id QF4ECQYHKmIT for ; Wed, 23 Sep 2015 11:52:26 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (unknown [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 9C2E920F5E for ; Wed, 23 Sep 2015 11:52:25 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id DEB39E046A for ; Wed, 23 Sep 2015 11:52:24 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B83433A06F5 for ; Wed, 23 Sep 2015 11:52:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1704824 - /subversion/trunk/subversion/libsvn_diff/binary_diff.c Date: Wed, 23 Sep 2015 11:52:24 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150923115224.B83433A06F5@svn01-us-west.apache.org> Author: rhuijben Date: Wed Sep 23 11:52:22 2015 New Revision: 1704824 URL: http://svn.apache.org/viewvc?rev=1704824&view=rev Log: * subversion/libsvn_diff/binary_diff.c (svn_diff__base85_decode_line): Use slightly different type to avoid comparing signed with unsigned after extending types. Modified: subversion/trunk/subversion/libsvn_diff/binary_diff.c Modified: subversion/trunk/subversion/libsvn_diff/binary_diff.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/binary_diff.c?rev=1704824&r1=1704823&r2=1704824&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_diff/binary_diff.c (original) +++ subversion/trunk/subversion/libsvn_diff/binary_diff.c Wed Sep 23 11:52:22 2015 @@ -115,7 +115,7 @@ svn_diff__base85_decode_line(char *outpu apr_pool_t *scratch_pool) { { - apr_size_t expected_data = (output_len + 3) / 4 * 5; + apr_ssize_t expected_data = (output_len + 3) / 4 * 5; if (base85_len != expected_data) return svn_error_create(SVN_ERR_DIFF_UNEXPECTED_DATA, NULL,