projects
/
platform
/
upstream
/
dbus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c3034f
)
_dbus_test_oom_handling: allow disabling it as documented
author
Simon McVittie
<smcv@debian.org>
Tue, 24 Nov 2015 09:21:12 +0000
(09:21 +0000)
committer
Ralf Habacker
<ralf.habacker@freenet.de>
Tue, 1 Dec 2015 23:53:00 +0000
(
00:53
+0100)
We documented DBUS_TEST_MALLOC_FAILURES=0 in HACKING, but it didn't
actually work: we'd iterate from i=-1 to i=0.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93194
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
dbus/dbus-internals.c
patch
|
blob
|
history
diff --git
a/dbus/dbus-internals.c
b/dbus/dbus-internals.c
index
30a5fa7
..
d7ef089
100644
(file)
--- a/
dbus/dbus-internals.c
+++ b/
dbus/dbus-internals.c
@@
-1066,6
+1066,12
@@
_dbus_test_oom_handling (const char *description,
max_failures_to_try = 4;
}
+ if (max_failures_to_try < 1)
+ {
+ _dbus_verbose ("not testing OOM handling\n");
+ return TRUE;
+ }
+
i = setting ? max_failures_to_try - 1 : 1;
while (i < max_failures_to_try)
{