diff options
| author | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-09-25 21:13:53 +0200 |
|---|---|---|
| committer | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-09-25 21:13:53 +0200 |
| commit | 781ae59664f91fa55a9aeda3f5d93076e501d65a (patch) | |
| tree | 345768002c5114160531496bb525b84b778df1e2 /libcmis | |
| parent | e1f5178871979e39122462ec97a63ac70a3c1c41 (diff) | |
Fix Google Drive checkout crash.
ID-based protocol don't have path.
Change-Id: I4f1dd4f77870d1c77bbd3cd015dd88396003ed6d
Diffstat (limited to 'libcmis')
| -rw-r--r-- | libcmis/UnpackedTarball_cmis.mk | 4 | ||||
| -rw-r--r-- | libcmis/libcmis-0.4.1-empty-path.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk index 0b2a9fbc261d..d984c8535577 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 000000000000..c48265d21681 --- /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( ); |