Fix Lua panic when error() message is not a string

[oweals/minetest.git] / src / filesys.cpp

diff --git a/src/filesys.cpp b/src/filesys.cpp
index be61ba430465d987150d1a6b3294dc9fccae4bb7..f61b39b9465b191badf70befdb27da41e27b13f5 100644 (file)
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -303,9 +303,13 @@ bool RecursiveDelete(const std::string &path)
        {
                // Child
                char argv_data[3][10000];
+#ifdef __ANDROID__
+               strcpy(argv_data[0], "/system/bin/rm");
+#else
                strcpy(argv_data[0], "/bin/rm");
+#endif
                strcpy(argv_data[1], "-rf");
-               strncpy(argv_data[2], path.c_str(), 10000);
+               strncpy(argv_data[2], path.c_str(), sizeof(argv_data[2]) - 1);
                char *argv[4];
                argv[0] = argv_data[0];
                argv[1] = argv_data[1];