[Libreoffice-commits] .: 2 commits - android/qa sal/osl

[Tor Lillqvist]

 android/qa/sc/Makefile |    7 ++++++-
 sal/osl/unx/file.cxx   |    2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1921a96c323f5a0dcd846f5d17a6bbb3de208797
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 23 13:33:06 2012 +0200

    Add the filters_test test documents

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index dbf9fb4..0412f33 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -127,6 +127,7 @@ copy-stuff:
 	mkdir -p assets/bin assets/lib assets/xml/ure
 	cp $(OUTDIR)/bin/udkapi.rdb assets/bin
 	cp $(OUTDIR)/bin/types.rdb assets/bin
+#
 # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
 # So just hardcode the known APP_DATA_PATH for now...
 # Ditto for URE_INTERNAL_LIB_DIR
@@ -141,16 +142,20 @@ copy-stuff:
 		sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \
 	done
 	cp -R $(OUTDIR)/xml/registry assets/xml
+#
 # .res files
 	for F in $(OUTDIR)/bin/*.res; do \
 		cp $$F assets/bin; \
 	done
+#
+# Test documents for filters_test
+	(cd $(SRC_ROOT) && tar cf - sc/qa/unit/data) | (cd assets && tar xvf -)
+#
 # Then assets that are unpacked at run-time into the app's data directory.
 	mkdir -p assets/unpack/etc/fonts
 	cp fonts.conf assets/unpack/etc/fonts
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
-#
 	cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST)
 	echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
 
commit 5b715f0dd92aeb4c08c53f914b31ee8fe83e0e5d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 23 13:28:10 2012 +0200

    Don't crash when attempting to open non-existent files under /assets

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 7dd557a..aa6cc26 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -907,6 +907,8 @@ SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_u
         void *address;
         size_t size;
         address = lo_apkentry(cpFilePath, &size);
+        if (address == NULL)
+            return osl_File_E_NOENT;
         return osl_openMemoryAsFile(address, size, pHandle);
     }
 #endif