From nobody Wed Oct 21 20:48:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j91b323pDz6wV6h for ; Wed, 21 Oct 2026 20:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j91b31Ndvz4qlV for ; Wed, 21 Oct 2026 20:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpSi9EOAC/eavxEu8MfymUlqindjhPFeuzo6rxbDN6E=; b=KaQ5UB+I7IeoFINoyCi1FZVbHYtygppBEWIagY/5z7aHByr6n18Yg9x/X+Ut536SUil9f/ 6GccKFW9ddzyoIclneDqI8PXWeFUIcX9U/I0WfGr6o8a33vgivmaRZ8kOLV5meTO/fSsVk Ruju1apUNM6gHwmmayGJel4KDYpFqC9JqJjEPhnRREbnEt0L6WNJMq3/7wFJ08u2E91tnm PGYUsADZUEisHiQHp31QVY4Q+stc7GO08gaAxyha4kbG7ZVcDLmTQNFu/zvy1eL6KrIR4I Cn4/ocgMUFqC4Yuc8L8MlUw2/XbTlBuFYxpiBB9Cin4na9xh0o8JUXQjsO5nng== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792615711; b=dLJm8XGFCIaj+J+F7jdIa5AzyRmmRMD0vNfolNcN6tsq2rXaED6XbSyfITG4lRbbi44Aqc aVAKYAwGWL8Hq68Z1OmxYD5EY8R2yitjJ1z6AtWQ/m/NpaGTR66pRV0LipzxXUoyOChSOu C9iLlPNp7rUp4s4MSRJrrJx69Wb7dCwjtC5qwIXlVu1TQ6xAIdqVyebWXtjs9UkkyNZlRu 75T9B6Oj5quluEcdwgw3s6p6DrgZtl6Tp8ESJy8naPUiqsHddc1/m8C/22UJkMRk6Oe1Sd sTo+LmWLELxcKHwXz8RkV/LGUYkkfXtBZrXR5HYyqcxUokk23BxoYfhhfQ42sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpSi9EOAC/eavxEu8MfymUlqindjhPFeuzo6rxbDN6E=; b=lRiuEx+nuJhpn1nzS29oPg+IpBy1IJx0zK6OK98DDgVerFD09fNPuFDRTO6o+PgD9f+zrB dbtaUP0h10MQx2P1viU2cBSYDOwb950vQEFrFrYmTkjZO00hLVE0oCGbHl2FSGfL8APK0Y s4jNtLpLOCbMddMGlhJa73QjlfglRnRUAU/RQQtBwG07rGOgnjgRJTP1ywBKrMalFlX9w6 Bu4IcCmDBzQax+NewvPU+6jSXbLiOMLClaQHONoILWkTJfC3u5Fjuix+3OKCu72T8K0hh4 XNZbhFBoNIF5jLTeS/karX32FUYeTqDFEz1WT0XkboyFHuHI3PPY9d7LSY7QUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j91b313S3z19c7 for ; Wed, 21 Oct 2026 20:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Oct 2026 20:48:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 38407c46ded9 - main - mkimg: Use reallocf List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38407c46ded957a2ecb7fe2a0dca6c4ac8e802f3 Auto-Submitted: auto-generated Date: Wed, 21 Oct 2026 20:48:31 +0000 Message-Id: <6ad9251f.1fc48.67dbcb2b@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=38407c46ded957a2ecb7fe2a0dca6c4ac8e802f3 commit 38407c46ded957a2ecb7fe2a0dca6c4ac8e802f3 Author: Colin Percival AuthorDate: 2026-10-06 20:01:39 +0000 Commit: Colin Percival CommitDate: 2026-10-21 19:42:43 +0000 mkimg: Use reallocf Reviewed by: ngie Suggested by: ngie Improves: 1a0523197c5c ("mkimg: Check for realloc failure") MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60419 --- usr.bin/mkimg/vmdk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 8b16c6b57eae..0eb6292cd229 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -169,12 +169,9 @@ vmdk_write(int fd) return (ENOMEM); desc_len = (n + VMDK_SECTOR_SIZE - 1) & ~(VMDK_SECTOR_SIZE - 1); - buf = realloc(desc, desc_len); - if (buf == NULL) { - free(desc); + desc = reallocf(desc, desc_len); + if (desc == NULL) return (ENOMEM); - } - desc = buf; memset(desc + n, 0, desc_len - n); le64enc(&hdr.desc_offset, 1);