Fix buffer overflow vulnerabilities when parsing HTTP redirect

[nagiosplug.git] / plugins / common.h

diff --git a/plugins/common.h b/plugins/common.h
index b4699cef1347c983715b19a8f88e80504eebd6c6..752e21fffe4ab2a67a5a5eea0750d4883bb74a1c 100644 (file)
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -36,6 +36,12 @@
 #define _COMMON_H_
 
 #include "config.h"
+/* This needs to be removed for Solaris servers, where 64 bit files, but 32 bit architecture
+   This needs to be done early on because subsequent system includes use _FILE_OFFSET_BITS
+   Cannot remove from config.h because is included by regex.c from lib/ */
+#if __sun__ && !defined(_LP64) && _FILE_OFFSET_BITS == 64
+#undef _FILE_OFFSET_BITS
+#endif
 
 #ifdef HAVE_FEATURES_H
 #include <features.h>
@@ -45,6 +51,20 @@
 #include <stdlib.h>
 #include <errno.h>
 
+/* This block provides uintmax_t - should be reported to coreutils that this should be added to fsuage.h */
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#include <unistd.h>
+#ifndef UINTMAX_MAX
+# define UINTMAX_MAX ((uintmax_t) -1)
+#endif
+
+#include <limits.h>    /* This is assumed true, because coreutils assume it too */
+
 #ifdef HAVE_MATH_H
 #include <math.h>
 #endif
@@ -60,6 +80,18 @@
 #include <unistd.h>
 #endif
 
+/* GET_NUMBER_OF_CPUS is a macro to return 
+   number of CPUs, if we can get that data.
+   Use configure.in to test for various OS ways of
+   getting that data
+   Will return -1 if cannot get data
+*/
+#ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF 
+#define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
+#else
+#define GET_NUMBER_OF_CPUS() -1
+#endif
+
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -83,40 +115,19 @@
 #include <signal.h>
 #endif
 
-/* TODO: define can be removed when all ifdef in each plugin has been removed */
-#define HAVE_GETOPT_H
+/* GNU Libraries */
 #include <getopt.h>
-
-#include <ctype.h>
-
-#ifdef HAVE_LWRES_NETDB_H
-#include <lwres/netdb.h>
-#else
-# if !HAVE_GETADDRINFO
-#  include "getaddrinfo.h"
-# else
-#  include <netdb.h>
-# endif
-#endif
+#include "dirname.h"
+#include "vasprintf.h"
+#include "snprintf.h"
+#include "vsnprintf.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
 
-#ifdef HAVE_DECL_SWAPCTL
-# ifdef HAVE_SYS_SWAP_H
-#  include <sys/swap.h>
-# endif
-# ifdef HAVE_SYS_STAT_H
-#  include <sys/stat.h>
-# endif
-# ifdef HAVE_SYS_PARAM_H
-#  include <sys/param.h>
-# endif
-#endif
-
-#ifndef SWAP_CONVERSION
-# define SWAP_CONVERSION 1
+#ifdef HAVE_SYS_POLL_H
+# include "sys/poll.h"
 #endif
 
 /*
@@ -133,22 +144,6 @@
 # define strtoul(a,b,c) (unsigned long)atol((a))
 #endif
 
-#ifndef HAVE_ASPRINTF
-int asprintf(char **strp, const char *fmt, ...);
-#endif
-
-#ifndef HAVE_VASPRINTF
-/* int vasprintf(char **strp, const char *fmt, va_list ap); */
-#endif
-
-#ifndef HAVE_SNPRINTF
-int snprintf(char *str, size_t size, const  char  *format, ...);
-#endif
-
-#ifndef HAVE_VSNPRINTF
-int vsnprintf(char *str, size_t size, const char  *format, va_list ap);
-#endif
-
 /* SSL implementations */
 #ifdef HAVE_GNUTLS_OPENSSL_H
 #  include <gnutls/openssl.h>
@@ -191,6 +186,11 @@ enum {
 };
 #endif
 
+/* Solaris does not have floorf, but floor works. Should probably be in configure */
+#if defined(__sun) || defined(__sun__)
+static inline float floorf (float x) { return floor(x); }
+#endif
+
 enum {
        STATE_OK,
        STATE_WARNING,
@@ -201,7 +201,7 @@ enum {
 
 enum {
        DEFAULT_SOCKET_TIMEOUT = 10,     /* timeout after 10 seconds */
-       MAX_INPUT_BUFFER = 1024,             /* max size of most buffers we use */
+       MAX_INPUT_BUFFER = 8192,             /* max size of most buffers we use */
        MAX_HOST_ADDRESS_LENGTH = 256    /* max size of a host address */
 };
 
@@ -212,6 +212,12 @@ enum {
  */
 #include "gettext.h"
 #define _(String) gettext (String)
+#if ! ENABLE_NLS
+# undef textdomain
+# define textdomain(Domainname) /* empty */
+# undef bindtextdomain
+# define bindtextdomain(Domainname, Dirname) /* empty */
+#endif
 
 /* For non-GNU compilers to ignore __attribute__ */
 #ifndef __GNUC__