diff options
author | Andras Timar <andras.timar@collabora.com> | 2015-07-08 14:16:55 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-07-08 12:29:49 +0000 |
commit | 5c10e8cd0eedefc2dcc905154c4daa142561aef3 (patch) | |
tree | de632b43ad4a502e19eeb22742644f122774f6d5 /external | |
parent | ecc617e797aa5ed329668114e54ec7ffa5c0e87b (diff) |
tdf#90351 libcmis: prevent crash
Change-Id: I2d9673bb261a2586e1802f025c900962249cfc42
Reviewed-on: https://gerrit.libreoffice.org/16854
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/libcmis/UnpackedTarball_cmis.mk | 1 | ||||
-rw-r--r-- | external/libcmis/tdf90351.patch | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index 16d440054f2d..b4b596b29fd8 100644 --- a/external/libcmis/UnpackedTarball_cmis.mk +++ b/external/libcmis/UnpackedTarball_cmis.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ external/libcmis/libcmis-libxml2_compatibility.patch \ + external/libcmis/tdf90351.patch \ )) ifeq ($(OS)$(COM),WNTMSC) diff --git a/external/libcmis/tdf90351.patch b/external/libcmis/tdf90351.patch new file mode 100644 index 000000000000..fe0e5c55d3c0 --- /dev/null +++ b/external/libcmis/tdf90351.patch @@ -0,0 +1,10 @@ +--- src/libcmis/atom-session.cxx ++++ src/libcmis/atom-session.cxx +@@ -233,6 +233,7 @@ libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc ) + else + { + // Not a valid CMIS atom entry... weird ++ cmisObject.reset( new AtomDocument( this, node ) ); + } + } + xmlXPathFreeObject( xpathObj ); |