From owner-freebsd-current@FreeBSD.ORG Fri Feb 20 21:59:14 2015 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 968534EA for ; Fri, 20 Feb 2015 21:59:14 +0000 (UTC) Received: from mail-ig0-x236.google.com (mail-ig0-x236.google.com [IPv6:2607:f8b0:4001:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E470F7C for ; Fri, 20 Feb 2015 21:59:14 +0000 (UTC) Received: by mail-ig0-f182.google.com with SMTP id h15so6483880igd.3 for ; Fri, 20 Feb 2015 13:59:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=1b5n5ZuJYt1rG1vqoTqCuuOVw0jilx8CxIWLJrAQGcU=; b=0aSyzk9tq9Wx8XIWEBaj2jVZx8Sw4+fvVbKvBccXzmowq6eREPmbDdf92wzHZg+4cO Nhr4XP5oTz2ebdXT1j/wAonnBUcDB2mgFiIcyNYQ489UlYr7+emcR7KEpg4er9VnLuvi J7IMU2iki16t7LFnDIZkWC9kvMzXuRQC/Jx46kvI6oDx4U+gOKfxTWTeEOJHSr/2KHWb RqKfom7fTB9cgPq7E6tizCmhMYp/hlpvT3Xcvi3VCPugY/zGkkEaumlyiKT2XUxdofbG xLy8Wf+cqU6/5FnQoYIBLvcWTc4ULX5mE/h5gUfVdapA15vJg9hkki933m0NE7tVFzOr aIOw== MIME-Version: 1.0 X-Received: by 10.107.9.26 with SMTP id j26mr92145ioi.91.1424469553808; Fri, 20 Feb 2015 13:59:13 -0800 (PST) Received: by 10.42.162.132 with HTTP; Fri, 20 Feb 2015 13:59:13 -0800 (PST) Date: Fri, 20 Feb 2015 23:59:13 +0200 Message-ID: Subject: [patch] sys/boot/fdt/fdt_loader_cmd.c From: Dmitry Luhtionov To: freebsd-current@freebsd.org X-Mailman-Approved-At: Fri, 20 Feb 2015 22:25:07 +0000 Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 21:59:14 -0000 --- sys/boot/fdt/fdt_loader_cmd.c.orig 2015-02-04 10:06:18.000000000 +0200 +++ sys/boot/fdt/fdt_loader_cmd.c 2015-02-20 23:50:26.000000000 +0200 @@ -1299,13 +1299,12 @@ fdt_merge_strings(int argc, char *argv[] sz += argc - start; buf = (char *)malloc(sizeof(char) * sz); - bzero(buf, sizeof(char) * sz); - if (buf == NULL) { sprintf(command_errbuf, "could not allocate space " "for string"); return (1); } + bzero(buf, sizeof(char) * sz); idx = 0; for (i = start, idx = 0; i < argc; i++) {