From patchwork Fri Nov 15 10:29:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 3187601 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2956AC045B for ; Fri, 15 Nov 2013 10:33:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A264C207D6 for ; Fri, 15 Nov 2013 10:33:49 +0000 (UTC) Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mail.kernel.org (Postfix) with ESMTP id 9C70520979 for ; Fri, 15 Nov 2013 10:33:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rAFAV9NI027940; Fri, 15 Nov 2013 05:31:09 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rAFAUI5C018580 for ; Fri, 15 Nov 2013 05:30:18 -0500 Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.17]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAFAU7NI000339 for ; Fri, 15 Nov 2013 05:30:17 -0500 Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAFAU4UH029878 for ; Fri, 15 Nov 2013 05:30:06 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0D162A70DC; Fri, 15 Nov 2013 11:30:04 +0100 (CET) From: Hannes Reinecke To: Christophe Varoqui Date: Fri, 15 Nov 2013 11:29:34 +0100 Message-Id: <1384511384-27642-4-git-send-email-hare@suse.de> In-Reply-To: <1384511384-27642-1-git-send-email-hare@suse.de> References: <1384511384-27642-1-git-send-email-hare@suse.de> X-RedHat-Spam-Score: -7.3 (BAYES_00, DCC_REPUT_00_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, URIBL_BLOCKED) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.17 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com Subject: [dm-devel] [PATCH 03/13] libmultipath: fixup strlcpy X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The final comparison was wrong; 'size' was never decreased. Signed-off-by: Hannes Reinecke --- libmultipath/util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libmultipath/util.c b/libmultipath/util.c index 41ac21b..a9f5939 100644 --- a/libmultipath/util.c +++ b/libmultipath/util.c @@ -112,8 +112,7 @@ size_t strlcpy(char *dst, const char *src, size_t size) bytes++; } - /* If size == 0 there is no space for a final null... */ - if (size) + if (bytes == size) *q = '\0'; return bytes; }