Security: Fix resolving of some relative paths

[minetest.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 9684aa2dff50e2d44f31ca9126e140b5eb7500d0..2098942db7ec17e457fa72fb8e88d50f5e3c9d40 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <exception>
 #include <assert.h>
 #include "gettime.h"
+#include "log.h"
 
 #if (defined(WIN32) || defined(_WIN32_WCE))
        #define WIN32_LEAN_AND_MEAN
@@ -34,15 +35,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #ifdef _MSC_VER
                #include <eh.h>
        #endif
-       #define __NORETURN __declspec(noreturn)
-       #define __FUNCTION_NAME __FUNCTION__
+       #define NORETURN __declspec(noreturn)
+       #define FUNCTION_NAME __FUNCTION__
 #else
-       #define __NORETURN __attribute__ ((__noreturn__))
-       #define __FUNCTION_NAME __PRETTY_FUNCTION__
+       #define NORETURN __attribute__ ((__noreturn__))
+       #define FUNCTION_NAME __PRETTY_FUNCTION__
 #endif
 
 // Whether to catch all std::exceptions.
-// Assert will be called on such an event.
+// When "catching", the program will abort with an error message.
 // In debug mode, leave these for the debugger and don't catch them.
 #ifdef NDEBUG
        #define CATCH_UNHANDLED_EXCEPTIONS 1
@@ -50,42 +51,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define CATCH_UNHANDLED_EXCEPTIONS 0
 #endif
 
-/*
-       Debug output
-*/
-
-#define DTIME (getTimestamp()+": ")
-
-extern void debugstreams_init(bool disable_stderr, const char *filename);
-extern void debugstreams_deinit();
-
-// This is used to redirect output to /dev/null
-class Nullstream : public std::ostream {
-public:
-       Nullstream():
-               std::ostream(0)
-       {
-       }
-private:
-};
-
-extern std::ostream dstream;
-extern std::ostream dstream_no_stderr;
-extern Nullstream dummyout;
-
-
 /* Abort program execution immediately
  */
-__NORETURN extern void fatal_error_fn(
+NORETURN extern void fatal_error_fn(
                const char *msg, const char *file,
                unsigned int line, const char *function);
 
 #define FATAL_ERROR(msg) \
-       fatal_error_fn((msg), __FILE__, __LINE__, __FUNCTION_NAME)
+       fatal_error_fn((msg), __FILE__, __LINE__, FUNCTION_NAME)
 
 #define FATAL_ERROR_IF(expr, msg) \
        ((expr) \
-       ? fatal_error_fn((msg), __FILE__, __LINE__, __FUNCTION_NAME) \
+       ? fatal_error_fn((msg), __FILE__, __LINE__, FUNCTION_NAME) \
        : (void)(0))
 
 /*
@@ -94,14 +71,14 @@ __NORETURN extern void fatal_error_fn(
        defined)
 */
 
-__NORETURN extern void sanity_check_fn(
+NORETURN extern void sanity_check_fn(
                const char *assertion, const char *file,
                unsigned int line, const char *function);
 
 #define SANITY_CHECK(expr) \
        ((expr) \
        ? (void)(0) \
-       : sanity_check_fn(#expr, __FILE__, __LINE__, __FUNCTION_NAME))
+       : sanity_check_fn(#expr, __FILE__, __LINE__, FUNCTION_NAME))
 
 #define sanity_check(expr) SANITY_CHECK(expr)
 
@@ -145,16 +122,16 @@ class DebugStacker
 
 #if CATCH_UNHANDLED_EXCEPTIONS == 1
        #define BEGIN_DEBUG_EXCEPTION_HANDLER try {
-       #define END_DEBUG_EXCEPTION_HANDLER(logstream) \
-               } catch (std::exception &e) {                               \
-                       logstream << "ERROR: An unhandled exception occurred: " \
-                               << e.what() << std::endl;                           \
-                       assert(0);                                              \
+       #define END_DEBUG_EXCEPTION_HANDLER                        \
+               } catch (std::exception &e) {                          \
+                       errorstream << "An unhandled exception occurred: " \
+                               << e.what() << std::endl;                      \
+                       FATAL_ERROR(e.what());                             \
                }
 #else
        // Dummy ones
        #define BEGIN_DEBUG_EXCEPTION_HANDLER
-       #define END_DEBUG_EXCEPTION_HANDLER(logstream)
+       #define END_DEBUG_EXCEPTION_HANDLER
 #endif
 
 #endif // DEBUG_HEADER