From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 20 Feb 2015 16:01:25 +0000 (+0000)
Subject: tests: reassure clang that oom() does in fact not return
X-Git-Tag: dbus-1.9.14~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e554e1b4ba03db225d0195f8c5ed994c26efc36e;p=thirdparty%2Fdbus.git

tests: reassure clang that oom() does in fact not return

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89243
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/test/fdpass.c b/test/fdpass.c
index 96f9427f9..65ade4c11 100644
--- a/test/fdpass.c
+++ b/test/fdpass.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef G_OS_UNIX
@@ -108,6 +109,7 @@ static void
 oom (const gchar *doing)
 {
   g_error ("out of memory (%s)", doing);
+  abort ();
 }
 
 static void
diff --git a/test/manual-authz.c b/test/manual-authz.c
index f9e3688e1..ee9bc52f9 100644
--- a/test/manual-authz.c
+++ b/test/manual-authz.c
@@ -30,6 +30,7 @@
 
 #include <dbus/dbus.h>
 
+#include <stdlib.h>
 #ifdef G_OS_UNIX
 #include <unistd.h>
 #include <sys/types.h>
@@ -57,6 +58,7 @@ static void
 oom (void)
 {
   g_error ("out of memory");
+  abort ();
 }
 
 static void