← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick

« back to all changes in this revision

Viewing changes to dbus/dbus-memory.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-27 13:06:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100927130632-bqs145trvchd2lmf
Tags: 1.4.0-0ubuntu1
* New upstream release
 - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=17754 Race condition in protected_change_timeout
 - Requested by various upstream KDE developers http://lists.kde.org/?t=128514970000004&r=1&w=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
dbus/dbus-memory.c
21
21
 *
22
22
 */
23
23
 
 
24
#include <config.h>
24
25
#include "dbus-memory.h"
25
26
#include "dbus-internals.h"
26
27
#include "dbus-sysdeps.h"
232
233
}
233
234
 
234
235
#ifdef DBUS_BUILD_TESTS
 
236
static dbus_bool_t called = 0;
235
237
/**
236
238
 * Called when about to alloc some memory; if
237
239
 * it returns #TRUE, then the allocation should
244
246
_dbus_decrement_fail_alloc_counter (void)
245
247
{
246
248
  _dbus_initialize_malloc_debug ();
247
 
  
 
249
#ifdef DBUS_WIN_FIXME
 
250
  {
 
251
    if (!called)
 
252
      {
 
253
        _dbus_verbose("TODO: memory allocation testing errors disabled for now\n");
 
254
        called = 1;
 
255
      }
 
256
    return FALSE;
 
257
  }
 
258
#endif
 
259
 
248
260
  if (fail_alloc_counter <= 0)
249
261
    {
250
262
      if (backtrace_on_fail_alloc)