From patchwork Sun Nov 4 22:19:40 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: 197100 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 BBEF62C0176 for ; Mon, 5 Nov 2012 09:19:54 +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 1TV8Xp-00018n-JQ; Sun, 04 Nov 2012 22:19:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TV8Xn-000184-FR for fwts-devel@lists.ubuntu.com; Sun, 04 Nov 2012 22:19:51 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TV8Xn-0000Li-D8 for fwts-devel@lists.ubuntu.com; Sun, 04 Nov 2012 22:19:51 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 02/12] lib: fwts_stringextras: use strncpy, strncat instead of strcpy, strcat Date: Sun, 4 Nov 2012 22:19:40 +0000 Message-Id: <1352067590-11820-3-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352067590-11820-1-git-send-email-colin.king@canonical.com> References: <1352067590-11820-1-git-send-email-colin.king@canonical.com> 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 --- src/lib/src/fwts_stringextras.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/src/fwts_stringextras.c b/src/lib/src/fwts_stringextras.c index 0143477..91b4b1a 100644 --- a/src/lib/src/fwts_stringextras.c +++ b/src/lib/src/fwts_stringextras.c @@ -50,13 +50,15 @@ char *fwts_realloc_strcat(char *orig, const char *newstr) size_t newlen = strlen(newstr); if (orig) { - if ((orig = realloc(orig, strlen(orig) + newlen + 1)) == NULL) + newlen += strlen(orig) + 1; + if ((orig = realloc(orig, newlen)) == NULL) return NULL; - strcat(orig, newstr); + strncat(orig, newstr, newlen); } else { - if ((orig = malloc(newlen + 1)) == NULL) + newlen++; + if ((orig = malloc(newlen)) == NULL) return NULL; - strcpy(orig, newstr); + strncpy(orig, newstr, newlen); } return orig; }