From commits-return-12289-apmail-apr-commits-archive=apr.apache.org@apr.apache.org  Sat Oct 15 20:50:04 2011
Return-Path: <commits-return-12289-apmail-apr-commits-archive=apr.apache.org@apr.apache.org>
X-Original-To: apmail-apr-commits-archive@www.apache.org
Delivered-To: apmail-apr-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 842589CE8
	for <apmail-apr-commits-archive@www.apache.org>; Sat, 15 Oct 2011 20:50:04 +0000 (UTC)
Received: (qmail 51242 invoked by uid 500); 15 Oct 2011 20:50:04 -0000
Delivered-To: apmail-apr-commits-archive@apr.apache.org
Received: (qmail 51192 invoked by uid 500); 15 Oct 2011 20:50:04 -0000
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:commits@apr.apache.org>
List-Help: <mailto:commits-help@apr.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
List-Id: <commits.apr.apache.org>
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 51185 invoked by uid 99); 15 Oct 2011 20:50:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Oct 2011 20:50:04 +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, 15 Oct 2011 20:50:02 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2C1FC238888F
	for <commits@apr.apache.org>; Sat, 15 Oct 2011 20:49:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1183689 - in /apr/apr/trunk: CHANGES memcache/apr_memcache.c
Date: Sat, 15 Oct 2011 20:49:41 -0000
To: commits@apr.apache.org
From: sf@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111015204941.2C1FC238888F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sf
Date: Sat Oct 15 20:49:40 2011
New Revision: 1183689

URL: http://svn.apache.org/viewvc?rev=1183689&view=rev
Log:
Fix possible segfault.

PR: 51064
Submitted by: Michajlo Matijkiw <michajlo_matijkiw comcast com>

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/memcache/apr_memcache.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1183689&r1=1183688&r2=1183689&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Sat Oct 15 20:49:40 2011
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) apr_memcache_server_create: Fix possible segfault. PR 51064.
+     [Michajlo Matijkiw <michajlo_matijkiw comcast com>]
+
   *) apr_dir_make_recursive: Fix race condition that could lead to EEXIST
      being returned. PR 51254. [William Lee <william lee rainstor com>,
      Wim Lewis <wiml omnigroup com>]

Modified: apr/apr/trunk/memcache/apr_memcache.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/memcache/apr_memcache.c?rev=1183689&r1=1183688&r2=1183689&view=diff
==============================================================================
--- apr/apr/trunk/memcache/apr_memcache.c (original)
+++ apr/apr/trunk/memcache/apr_memcache.c Sat Oct 15 20:49:40 2011
@@ -418,15 +418,17 @@ APR_DECLARE(apr_status_t) apr_memcache_s
                                mc_conn_construct,       /* Make a New Connection */
                                mc_conn_destruct,        /* Kill Old Connection */
                                server, np);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
 
     apr_reslist_cleanup_order_set(server->conns, APR_RESLIST_CLEANUP_FIRST);
 #else
     rv = mc_conn_construct((void**)&(server->conn), server, np);
-#endif
-
     if (rv != APR_SUCCESS) {
         return rv;
     }
+#endif
 
     *ms = server;