From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 21 Jun 2011 13:09:52 +0000 (+0100)
Subject: In Windows _dbus_printf_string_upper_bound, don't crash on malloc failure
X-Git-Tag: dbus-1.5.6~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7bd2bb8487368ec61cc4c52517d806a2a51e2d4;p=thirdparty%2Fdbus.git

In Windows _dbus_printf_string_upper_bound, don't crash on malloc failure
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 7b03c3ddf..f9afadad5 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -549,6 +549,10 @@ int _dbus_printf_string_upper_bound (const char *format,
       bufsize *= 2;
 
       p = malloc (bufsize);
+
+      if (p == NULL)
+        return -1;
+
       len = _vsnprintf (p, bufsize - 1, format, args);
       free (p);
     }