← Back to branch summary

~ubuntu-branches/ubuntu/natty/dbus/natty

« back to all changes in this revision

Viewing changes to bus/config-loader-expat.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:
bus/config-loader-expat.c
21
21
 *
22
22
 */
23
23
 
 
24
#include <config.h>
24
25
#include "config-parser.h"
25
26
#include <dbus/dbus-internals.h>
26
27
#include <expat.h>
27
28
 
28
 
static XML_Memory_Handling_Suite memsuite =
29
 
{
30
 
  dbus_malloc,
31
 
  dbus_realloc,
32
 
  dbus_free
33
 
};
 
29
static XML_Memory_Handling_Suite memsuite;
34
30
 
35
31
typedef struct
36
32
{
195
191
      _dbus_string_free (&context.content);
196
192
      return NULL;
197
193
    }
198
 
  
 
194
 
 
195
  memsuite.malloc_fcn = dbus_malloc;
 
196
  memsuite.realloc_fcn = dbus_realloc;
 
197
  memsuite.free_fcn = dbus_free;
 
198
 
199
199
  expat = XML_ParserCreate_MM ("UTF-8", &memsuite, NULL);
200
200
  if (expat == NULL)
201
201
    {