blob: d3aa7aa4c34e3b3079e91509f82b045b77b8b538 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From 01ae7ce6a7f270937face6aec75db28d30d83059 Mon Sep 17 00:00:00 2001
Message-ID: <01ae7ce6a7f270937face6aec75db28d30d83059.1738773172.git.sam@gentoo.org>
From: Sam James <sam@gentoo.org>
Date: Wed, 5 Feb 2025 16:16:06 +0000
Subject: [PATCH] Fix dodgy assert with side-effects in insert_cached_dirfd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Michał Górny <mgorny@gentoo.org> reported that patch was running out of
FDs and that the `deep-directories` test was failing. This turns out
to be because `hash_insert` isn't called at all with `-DNDEBUG` because
`insert_cached_dirfd` only calls it in one case inside of an `assert`.
See https://github.com/conda-forge/patch-feedstock/issues/11.
This regressed in 025a54b789bd88ed15430f8633514e296826983e.
* src/safe.c (insert_cached_dirfd): Don't use 'assert' for 'hash_insert'
call with side-effects.
--- a/src/safe.c
+++ b/src/safe.c
@@ -183,7 +183,8 @@ static void insert_cached_dirfd (struct cached_dirfd *entry, int keepfd)
/* Only insert if the parent still exists. */
if (! list_empty (&entry->children_link))
- assert (hash_insert (cached_dirfds, entry) == entry);
+ if (hash_insert (cached_dirfds, entry) != entry)
+ xalloc_die ();
}
static void invalidate_cached_dirfd (int dirfd, const char *name)
base-commit: 1da6bf84db2ed0be88ccb47139256e48243a75f0
--
2.48.1
|
GitWeb
