[Libreoffice-commits] core.git: libcmis/libcmis-0.4.1-empty-path.patch libcmis/UnpackedTarball_cmis.mk

[Cao Cuong Ngo]

 libcmis/UnpackedTarball_cmis.mk        |    4 +++-
 libcmis/libcmis-0.4.1-empty-path.patch |   13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 781ae59664f91fa55a9aeda3f5d93076e501d65a
Author: Cao Cuong Ngo <cao.cuong.ngo at gmail.com>
Date:   Wed Sep 25 21:13:53 2013 +0200

    Fix Google Drive checkout crash.
    
    ID-based protocol don't have path.
    
    Change-Id: I4f1dd4f77870d1c77bbd3cd015dd88396003ed6d

diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
index 0b2a9fb..d984c85 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -13,7 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/libcmis-0.4.1.patch))
+$(eval $(call gb_UnpackedTarball_add_patches,cmis, \
+						libcmis/libcmis-0.4.1.patch \
+						libcmis/libcmis-0.4.1-empty-path.patch))
 
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
diff --git a/libcmis/libcmis-0.4.1-empty-path.patch b/libcmis/libcmis-0.4.1-empty-path.patch
new file mode 100644
index 0000000..c48265d2
--- /dev/null
+++ b/libcmis/libcmis-0.4.1-empty-path.patch
@@ -0,0 +1,13 @@
+diff --git src/libcmis/document.cxx src/libcmis/document.cxx
+index 1af0d63..7ecfd24 100644
+--- src/libcmis/document.cxx
++++ src/libcmis/document.cxx
+@@ -44,6 +44,8 @@ namespace libcmis
+                  it != parents.end(); ++it )
+             {
+                 string path = ( *it )->getPath( );
++                if ( path.empty() )
++                    continue;
+                 if ( path[path.size() - 1] != '/' )
+                     path += "/";
+                 path += getName( );