wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-01 12:37:59 +02:00
Code Activity

Fix 32-bit overflow with --no-net

Browse source 
--no-net causes tarballTtl to be set to the largest 32-bit integer,
which causes comparison like 'time + tarballTtl < other_time' to
fail on 32-bit systems. So cast them to 64-bit first.

https://hydra.nixos.org/build/95076624
(cherry picked from commit 29ccb2e969)
This commit is contained in:
Eelco Dolstra 2019-06-21 12:49:18 +02:00
parent f8b30338ac
commit 64ec087f58
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/download.cc
View file

@ -784,7 +784,7 @@ CachedDownloadResult Downloader::downloadCached(
auto ss = tokenizeString<vector<string>>(readFile(dataFile), "\n");
if (ss.size() >= 3 && ss[0] == url) {
time_t lastChecked;
if (string2Int(ss[2], lastChecked) && lastChecked + request.ttl >= time(0)) {
if (string2Int(ss[2], lastChecked) && (uint64_t) lastChecked + request.ttl >= (uint64_t) time(0)) {
skip = true;
result.effectiveUri = request.uri;
result.etag = ss[1];