2 files changed, 22 insertions, 7 deletions

diff --git a/lib/utils_base.c b/lib/utils_base.c
index addf26bd..3822bcf1 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -446,6 +446,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
         char *temp_filename = NULL;
         char *temp_keyname = NULL;
         char *p=NULL;
+        int ret;
 
         if(this_monitoring_plugin==NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
@@ -476,9 +477,13 @@ void np_enable_state(char *keyname, int expected_data_version) {
         this_state->state_data=NULL;
 
         /* Calculate filename */
-        asprintf(&temp_filename, "%s/%lu/%s/%s",
+        ret = asprintf(&temp_filename, "%s/%lu/%s/%s",
             _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
             this_monitoring_plugin->plugin_name, this_state->name);
+        if (ret < 0)
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
+                    strerror(errno));
+
         this_state->_filename=temp_filename;
 
         this_monitoring_plugin->state = this_state;
@@ -614,8 +619,8 @@ void np_state_write_string(time_t data_time, char *data_string) {
         
         /* If file doesn't currently exist, create directories */
         if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
-                asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
-                if(directories==NULL)
+                result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
+                if(result < 0)
                         die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                             strerror(errno));
 
@@ -633,8 +638,8 @@ void np_state_write_string(time_t data_time, char *data_string) {
                 np_free(directories);
         }
 
-        asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
-        if(temp_file==NULL)
+        result = asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
+        if(result < 0)
                 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                     strerror(errno));
 
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 9e214bd4..7eb9a3a0 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -79,12 +79,14 @@ static pid_t *_cmd_pids = NULL;
  * If that fails and the macro isn't defined, we fall back to an educated
  * guess. There's no guarantee that our guess is adequate and the program
  * will die with SIGSEGV if it isn't and the upper boundary is breached. */
+#define DEFAULT_MAXFD  256   /* fallback value if no max open files value is set */
+#define MAXFD_LIMIT   8192   /* upper limit of open files */
 #ifdef _SC_OPEN_MAX
 static long maxfd = 0;
 #elif defined(OPEN_MAX)
 # define maxfd OPEN_MAX
 #else   /* sysconf macro unavailable, so guess (may be wildly inaccurate) */
-# define maxfd 256
+# define maxfd DEFAULT_MAXFD
 #endif
 
 
@@ -112,10 +114,18 @@ cmd_init (void)
         if (!maxfd && (maxfd = sysconf (_SC_OPEN_MAX)) < 0) {
                 /* possibly log or emit a warning here, since there's no
                  * guarantee that our guess at maxfd will be adequate */
-                maxfd = 256;
+                maxfd = DEFAULT_MAXFD;
         }
 #endif
 
+        /* if maxfd is unnaturally high, we force it to a lower value
+         * ( e.g. on SunOS, when ulimit is set to unlimited: 2147483647 this would cause
+         * a segfault when following calloc is called ...  ) */
+
+        if ( maxfd > MAXFD_LIMIT ) {
+                maxfd = MAXFD_LIMIT;
+        }
+
         if (!_cmd_pids)
                 _cmd_pids = calloc (maxfd, sizeof (pid_t));
 }