]> granicus.if.org Git - libexpat/commit
Merge branch 'cve-2016-0718-fix-2-2-1'
authorSebastian Pipping <sebastian@pipping.org>
Tue, 17 May 2016 19:08:21 +0000 (21:08 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Tue, 17 May 2016 19:08:21 +0000 (21:08 +0200)
commitbe4b1c06daba1849b8ff5e00bae5caf47f6c39fd
treef9dbe477dce429eaf3e8f805460106a3dcf99c9c
parentf0bec73b018caa07d3e75ec8dd967f3785d71bde
parenta1bc009dd46cce3b3735c8f0c1a65a33c46f0c3f
Merge branch 'cve-2016-0718-fix-2-2-1'

Conflicts:
  expat/lib/xmltok.c
expat/lib/xmlparse.c
expat/lib/xmltok.c
expat/lib/xmltok_impl.c