~ubuntu-branches/ubuntu/utopic/expat/utopic

« back to all changes in this revision

Viewing changes to lib/xmltok.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-03-20 22:37:22 UTC
  • mfrom: (1.1.4) (5.1.7 precise)
  • Revision ID: package-import@ubuntu.com-20120320223722-wq8sq4gykhlvc8j9
Tags: 2.1.0~beta3-1
* QA upload.
* Beta release 2.1.0 beta3. Closes: #663579.
  - CVE-2012-1147 - Resource leak in readfilemap.c.
  - CVE-2012-1148 - Memory leak in poolGrow.
  - CVE-2012-0876 - Hash DOS attack.
  - Remove patches applied upstream.
* Remove Daniel from uploaders (orphaned package).
* Update package format to 3.0.
* Enable hardened build. Closes: #653526.
* Add a symbols file.
* Install expat pkgconfig file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
#include "winconfig.h"
9
9
#elif defined(MACOS_CLASSIC)
10
10
#include "macconfig.h"
11
 
#elif defined(__amigaos4__)
 
11
#elif defined(__amigaos__)
12
12
#include "amigaconfig.h"
13
13
#elif defined(__WATCOMC__)
14
14
#include "watcomconfig.h"
1345
1345
ENCODING *
1346
1346
XmlInitUnknownEncoding(void *mem,
1347
1347
                       int *table,
1348
 
                       CONVERTER convert, 
 
1348
                       CONVERTER convert,
1349
1349
                       void *userData)
1350
1350
{
1351
1351
  int i;
1639
1639
ENCODING *
1640
1640
XmlInitUnknownEncodingNS(void *mem,
1641
1641
                         int *table,
1642
 
                         CONVERTER convert, 
 
1642
                         CONVERTER convert,
1643
1643
                         void *userData)
1644
1644
{
1645
1645
  ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData);