From 22c73868c396ceb189ff2638768b3eea30120ded Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Mon, 20 Oct 2025 21:15:11 +0300 Subject: [PATCH] libutil/archive: Use alignUp With this change it's much more apparent what's going on. --- src/libutil/archive.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc index b8fef9ef3..73ec0cab7 100644 --- a/src/libutil/archive.cc +++ b/src/libutil/archive.cc @@ -6,6 +6,7 @@ #include // for strcasecmp #include "nix/util/archive.hh" +#include "nix/util/alignment.hh" #include "nix/util/config-global.hh" #include "nix/util/posix-source-accessor.hh" #include "nix/util/source-path.hh" @@ -133,7 +134,7 @@ static void parseContents(CreateRegularFileSink & sink, Source & source) sink.preallocateContents(size); if (sink.skipContents) { - source.skip(size + (size % 8 ? 8 - (size % 8) : 0)); + source.skip(alignUp(size, 8)); return; }