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 3FB7C10893 for ; Tue, 18 Mar 2014 23:00:58 +0000 (UTC) Received: (qmail 49331 invoked by uid 500); 18 Mar 2014 23:00:57 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 49304 invoked by uid 500); 18 Mar 2014 23:00:57 -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 49297 invoked by uid 99); 18 Mar 2014 23:00:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2014 23:00:57 +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; Tue, 18 Mar 2014 23:00:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 447562388A3B; Tue, 18 Mar 2014 23:00:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1579080 - /subversion/trunk/subversion/svnserve/cyrus_auth.c Date: Tue, 18 Mar 2014 23:00:36 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140318230036.447562388A3B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Tue Mar 18 23:00:35 2014 New Revision: 1579080 URL: http://svn.apache.org/r1579080 Log: Fix svnserve SEGV when SASL is enabled. * subversion/svnserve/cyrus_auth.c (try_auth): Initial token is optional. Modified: subversion/trunk/subversion/svnserve/cyrus_auth.c Modified: subversion/trunk/subversion/svnserve/cyrus_auth.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/cyrus_auth.c?rev=1579080&r1=1579079&r2=1579080&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/cyrus_auth.c (original) +++ subversion/trunk/subversion/svnserve/cyrus_auth.c Tue Mar 18 23:00:35 2014 @@ -186,7 +186,7 @@ static svn_error_t *try_auth(svn_ra_svn_ /* sasl uses unsigned int for the length of strings, we use apr_size_t * which may not be the same size. Deal with potential integer overflow */ - if (in->len > UINT_MAX) + if (in && in->len > UINT_MAX) return svn_error_createf(SVN_ERR_RA_NOT_AUTHORIZED, NULL, _("Initial token is too long"));