Return-Path: 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 21EF411515 for ; Sun, 11 May 2014 04:20:03 +0000 (UTC) Received: (qmail 28187 invoked by uid 500); 10 May 2014 22:14:51 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 26456 invoked by uid 500); 10 May 2014 22:14:43 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 25886 invoked by uid 99); 10 May 2014 22:14:41 -0000 Received: from Unknown (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 22:14:41 +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, 10 May 2014 10:29:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5801123889DA; Sat, 10 May 2014 10:28:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1593681 - in /apr/apr/branches/1.6.x: ./ strings/apr_cpystrn.c Date: Sat, 10 May 2014 10:28:49 -0000 To: commits@apr.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140510102849.5801123889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Sat May 10 10:28:48 2014 New Revision: 1593681 URL: http://svn.apache.org/r1593681 Log: Backport r1593680 from trunk: Fix NULL pointer dereference if out of mem in strdup() fallback function PR: 56385 Modified: apr/apr/branches/1.6.x/ (props changed) apr/apr/branches/1.6.x/strings/apr_cpystrn.c Propchange: apr/apr/branches/1.6.x/ ------------------------------------------------------------------------------ Merged /apr/apr/trunk:r1593680 Modified: apr/apr/branches/1.6.x/strings/apr_cpystrn.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/strings/apr_cpystrn.c?rev=1593681&r1=1593680&r2=1593681&view=diff ============================================================================== --- apr/apr/branches/1.6.x/strings/apr_cpystrn.c (original) +++ apr/apr/branches/1.6.x/strings/apr_cpystrn.c Sat May 10 10:28:48 2014 @@ -235,6 +235,8 @@ char *strdup(const char *str) size_t len = strlen(str) + 1; sdup = (char *) malloc(len); + if (sdup == NULL) + return NULL; memcpy(sdup, str, len); return sdup;