git: b3c301c30254 - stable/15 - mkimg: Use reallocf
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Oct 2026 05:52:35 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=b3c301c30254d81524f1b1c54c2c262f25263926
commit b3c301c30254d81524f1b1c54c2c262f25263926
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-10-06 20:01:39 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-28 01:13:01 +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
(cherry picked from commit 38407c46ded957a2ecb7fe2a0dca6c4ac8e802f3)
---
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);