jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move all sanity checks to a separate function xrdp_sanity_check()

Browse Source
This commit is contained in:
Pavel Roskin 2016-02-27 23:08:35 -08:00
parent cdb967c0f3
commit 86ec50789c
1 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
xrdp/xrdp.c
View File

@ -292,12 +292,65 @@ xrdp_process_params(int argc, char **argv,
return 0; 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 int DEFAULT_CC
main(int argc, char **argv) main(int argc, char **argv)
{ {
int test; int test;
int host_be;
char cfg_file[256]; char cfg_file[256];
enum logReturns error; enum logReturns error;
struct xrdp_startup_params *startup_params; struct xrdp_startup_params *startup_params;
@ -315,45 +368,6 @@ main(int argc, char **argv)
DEBUG(("Argument %i - %s", test, argv[test])); 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); g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
startup_params = (struct xrdp_startup_params *) startup_params = (struct xrdp_startup_params *)
@ -401,6 +415,13 @@ main(int argc, char **argv)
g_exit(0); g_exit(0);
} }
if (xrdp_sanity_check() != 0)
{
g_writeln("Fatal error occurred, exiting");
g_deinit();
g_exit(1);
}
if (startup_params->kill) if (startup_params->kill)
{ {
g_writeln("stopping xrdp"); g_writeln("stopping xrdp");