From patchwork Fri Mar 2 10:03:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 144189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 1A5341007D3 for ; Fri, 2 Mar 2012 21:03:51 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S3PL3-0008Ql-Tm for incoming@patchwork.ozlabs.org; Fri, 02 Mar 2012 10:03:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S3PL1-0008QH-A8 for fwts-devel@lists.ubuntu.com; Fri, 02 Mar 2012 10:03:47 +0000 Received: from cpc19-craw6-2-0-cust5.croy.cable.virginmedia.com ([77.102.228.6] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1S3PL1-0005UL-7a for fwts-devel@lists.ubuntu.com; Fri, 02 Mar 2012 10:03:47 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_stringextras: handle out of memory failure Date: Fri, 2 Mar 2012 10:03:46 +0000 Message-Id: <1330682626-18579-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.9 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Alex Hung --- src/lib/src/fwts_stringextras.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/lib/src/fwts_stringextras.c b/src/lib/src/fwts_stringextras.c index df0608d..babf2ed 100644 --- a/src/lib/src/fwts_stringextras.c +++ b/src/lib/src/fwts_stringextras.c @@ -54,7 +54,8 @@ char *fwts_realloc_strcat(char *orig, const char *newstr) return NULL; strcat(orig, newstr); } else { - orig = malloc(newlen + 1); + if ((orig = malloc(newlen + 1)) == NULL) + return NULL; strcpy(orig, newstr); } return orig;