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 DA3081751F for ; Fri, 23 Jan 2015 13:42:40 +0000 (UTC) Received: (qmail 57362 invoked by uid 500); 23 Jan 2015 13:42:41 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 57329 invoked by uid 500); 23 Jan 2015 13:42:41 -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 57311 invoked by uid 99); 23 Jan 2015 13:42:40 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 13:42:40 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id CE943AC010E; Fri, 23 Jan 2015 13:42:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1654210 - /subversion/trunk/subversion/libsvn_ra_serf/util.c Date: Fri, 23 Jan 2015 13:42:40 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150123134240.CE943AC010E@hades.apache.org> Author: rhuijben Date: Fri Jan 23 13:42:40 2015 New Revision: 1654210 URL: http://svn.apache.org/r1654210 Log: Resolve an segfault during error triggered after ^C in my debugging session. * subversion/libsvn_ra_serf/util.c (handler_cleanup): Don't segfault when a member is NULL. Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1654210&r1=1654209&r2=1654210&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_serf/util.c (original) +++ subversion/trunk/subversion/libsvn_ra_serf/util.c Fri Jan 23 13:42:40 2015 @@ -1877,7 +1877,7 @@ static apr_status_t handler_cleanup(void *baton) { svn_ra_serf__handler_t *handler = baton; - if (handler->scheduled && handler->conn) + if (handler->scheduled && handler->conn && handler->conn->conn) { serf_connection_reset(handler->conn->conn); }