From 86ec50789c8b88dbc38926c26f068c8a469aeb4c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Sat, 27 Feb 2016 23:08:35 -0800
Subject: [PATCH] Move all sanity checks to a separate function
 xrdp_sanity_check()

---
 xrdp/xrdp.c | 101 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 61 insertions(+), 40 deletions(-)

diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index 12fcb2fa..f985bba3 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -292,12 +292,65 @@ xrdp_process_params(int argc, char **argv,
     return 0;
 }
 
+/*****************************************************************************/
+/* Basic sanity checks before any forking */
+int
+xrdp_sanity_check(void)
+{
+    int intval = 1;
+    int host_be;
+
+    /* check compiled endian with actual endian */
+    host_be = !((int)(*(unsigned char *)(&intval)));
+
+#if defined(B_ENDIAN)
+    if (!host_be)
+    {
+        g_writeln("Not a big endian machine, edit arch.h");
+        return 1;
+    }
+#endif
+#if defined(L_ENDIAN)
+    if (host_be)
+    {
+        g_writeln("Not a little endian machine, edit arch.h");
+        return 1;
+    }
+#endif
+
+    /* check long, int and void* sizes */
+    if (sizeof(int) != 4)
+    {
+        g_writeln("unusable int size, must be 4");
+        return 1;
+    }
+
+    if (sizeof(long) != sizeof(void *))
+    {
+        g_writeln("long size must match void* size");
+        return 1;
+    }
+
+    if (sizeof(long) != 4 && sizeof(long) != 8)
+    {
+        g_writeln("unusable long size, must be 4 or 8");
+        return 1;
+    }
+
+    if (sizeof(tui64) != 8)
+    {
+        g_writeln("unusable tui64 size, must be 8");
+        return 1;
+    }
+
+    return 0;
+}
+
 /*****************************************************************************/
 int DEFAULT_CC
 main(int argc, char **argv)
 {
     int test;
-    int host_be;
     char cfg_file[256];
     enum logReturns error;
     struct xrdp_startup_params *startup_params;
@@ -315,45 +368,6 @@ main(int argc, char **argv)
         DEBUG(("Argument %i - %s", test, argv[test]));
     }
 
-    /* check compiled endian with actual endian */
-    test = 1;
-    host_be = !((int)(*(unsigned char *)(&test)));
-#if defined(B_ENDIAN)
-    if (!host_be)
-#endif
-#if defined(L_ENDIAN)
-        if (host_be)
-#endif
-        {
-            g_writeln("endian wrong, edit arch.h");
-            return 0;
-        }
-
-    /* check long, int and void* sizes */
-    if (sizeof(int) != 4)
-    {
-        g_writeln("unusable int size, must be 4");
-        return 0;
-    }
-
-    if (sizeof(long) != sizeof(void *))
-    {
-        g_writeln("long size must match void* size");
-        return 0;
-    }
-
-    if (sizeof(long) != 4 && sizeof(long) != 8)
-    {
-        g_writeln("unusable long size, must be 4 or 8");
-        return 0;
-    }
-
-    if (sizeof(tui64) != 8)
-    {
-        g_writeln("unusable tui64 size, must be 8");
-        return 0;
-    }
-
     g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
 
     startup_params = (struct xrdp_startup_params *)
@@ -401,6 +415,13 @@ main(int argc, char **argv)
         g_exit(0);
     }
 
+    if (xrdp_sanity_check() != 0)
+    {
+        g_writeln("Fatal error occurred, exiting");
+        g_deinit();
+        g_exit(1);
+    }
+
     if (startup_params->kill)
     {
         g_writeln("stopping xrdp");