Changeset 383 for trunk

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• include/sh_mem.h (modified) (2 diffs)
• include/sh_pthread.h (modified) (1 diff)
• src/depend-gen.c (modified) (2 diffs)
• src/dnmalloc.c (modified) (5 diffs)
• src/rijndael-alg-fst.c (modified) (1 diff)
• src/sh_error.c (modified) (1 diff)
• src/sh_extern.c (modified) (2 diffs)
• src/sh_files.c (modified) (11 diffs)
• src/sh_forward.c (modified) (12 diffs)
• src/sh_gpg.c (modified) (4 diffs)
• src/sh_hash.c (modified) (4 diffs)
• src/sh_html.c (modified) (4 diffs)
• src/sh_inotify.c (modified) (1 diff)
• src/sh_log_evalrule.c (modified) (4 diffs)
• src/sh_login_track.c (modified) (3 diffs)
• src/sh_mail.c (modified) (8 diffs)
• src/sh_portcheck.c (modified) (3 diffs)
• src/sh_processcheck.c (modified) (2 diffs)
• src/sh_readconf.c (modified) (1 diff)
• src/sh_restrict.c (modified) (1 diff)
• src/sh_socket.c (modified) (1 diff)
• src/sh_string.c (modified) (4 diffs)
• src/sh_suidchk.c (modified) (2 diffs)
• src/sh_tiger0.c (modified) (2 diffs)
• src/sh_tools.c (modified) (2 diffs)
• src/sh_unix.c (modified) (3 diffs)
• src/sh_utmp.c (modified) (6 diffs)
• src/slib.c (modified) (2 diffs)
• src/zAVLTree.c (modified) (3 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.0.0a)
+AM_INIT_AUTOMAKE(samhain, 3.0.1)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/include/sh_mem.h

@@ -35 +35 @@
 #define SH_FREE(a)   sh_mem_free((a), FIL__, __LINE__)
 #define SH_ALLOC(a)  sh_mem_malloc((a), FIL__, __LINE__) 
+#define SH_OALLOC(a,b,c)  sh_mem_malloc((a), (b), (c)) 
 
 #else
@@ -51 +52 @@
 #define SH_FREE(a)   sh_mem_free(a)
 #define SH_ALLOC(a)  sh_mem_malloc(a)
+#define SH_OALLOC(a,b,c)  ((void) (b),           \
+                           (void) (c),           \
+                           sh_mem_malloc(a))     \
 
 #endif

trunk/include/sh_pthread.h

@@ -31 +31 @@
         do {                                                               \
                 int oldtype;                                               \
-                int executeStack = 0;                                      \
+                volatile int executeStack = 0;                             \
                 pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldtype);  \
                 pthread_cleanup_push(sh_pthread_mutex_unlock, (void*)&(M));\

trunk/src/depend-gen.c

@@ -197 +197 @@
   p = strrchr(name, '/');
   if (p)
-    ++p;
-  len = strlen(p);
+    {
+      ++p;
+      len = strlen(p);
+    }
 
   /* skip other dependencies
@@ -206 +208 @@
       if (NULL == fgets(line, 1023, fout))
         break;
-      if (0 == strncmp(line, p, len))
+      if (p && 0 == strncmp(line, p, len))
         break;
       fprintf(ftmp, "%s", line);

trunk/src/dnmalloc.c

@@ -2854 +2854 @@
       assert(temp != NULL);
 #endif
-      prevtemp->hash_next = temp->hash_next;
+      if (temp) prevtemp->hash_next = temp->hash_next;
     }
 }
@@ -3558 +3558 @@
     
     else {
-      front_misalign = 0;
-      end_misalign = 0;
+      /* front_misalign = 0; *//*superfluous */
+      /* end_misalign = 0; *//*superfluous */
       correction = 0;
       aligned_brk = brk;
@@ -4284 +4284 @@
   retval = sYSMALLOc(nb, av);
   if (retval) {
-    victim = mem2chunk(retval);
+#if PARANOIA > 2
+    victim = mem2chunk(retval); /* is used in guard_set macro */
+#endif
     guard_set(av->guard_stored, victim, bytes, nb);
   }
@@ -5516 +5518 @@
         } rdat;
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-        size_t sz = 0;
+        ssize_t sz = 0;
         int    fd;
 #endif
@@ -5540 +5542 @@
         fd = open("/dev/urandom", O_RDONLY);
         if (fd != -1) {
-                sz = (size_t)read(fd, rdat.rnd, sizeof (rdat.rnd));
-                close(fd);
+                sz = (size_t)read(fd, rdat.rnd, sizeof (rdat.rnd));
+                /* 
+                 * gcc complains if we ignore the return value of read(), and
+                 * the llvm/clang analyzer complains if we don't use it...
+                 */
+                if (sz > (-256)) /* always true */
+                  close(fd);
         }
+        /*
         if (sz > sizeof (rdat.rnd))
                 sz = 0;
+        */
  #endif
 

trunk/src/rijndael-alg-fst.c

@@ -28 +28 @@
          */ 
         int j, r, t, rconpointer = 0;
-        word8 tk[MAXKC][4];
+        word8 tk[MAXKC][4] = { { 0 } }; /* init for llvm/clang analyzer */
         int KC = ROUNDS - 6;
         word32 tmp;

trunk/src/sh_error.c

@@ -648 +648 @@
     }
 
+  if (!str_s)
+    {
+      SL_RETURN ((-1), _("sh_error_set_level"));
+    }
   /* skip to end of string
    */

trunk/src/sh_extern.c

@@ -435 +435 @@
                   /* failed 
                    */
-                  _exit(EXIT_FAILURE);
+                  _exit((errnum == 0) ? (EXIT_SUCCESS) : (EXIT_FAILURE));
               }
               PDBGC_S("fexecve: not working");
@@ -471 +471 @@
           /* failed 
            */
-          _exit(EXIT_FAILURE);
+          _exit((errnum == 0) ? (EXIT_SUCCESS) : (EXIT_FAILURE));
         }
       /* 

trunk/src/sh_files.c

@@ -107 +107 @@
   po = SH_ALLOC(len+1); *po = '\0'; p = po; pend = &po[len];
 
-  i = 0; q = s;
+  q = s;
 
   do
@@ -925 +925 @@
 #endif
 
-int sh_files_push_file_int (int class, const char * str_s, size_t len, unsigned long check_mask)
+int sh_files_push_file_int (int class, const char * str_s, size_t len, 
+                            unsigned long check_mask)
 {
   dirstack_t * new_item_ptr;
   char  * fileName;
   int     ret;
-  int     count = 0;
+  volatile int     count = 0;
 
   SL_ENTER(_("sh_files_push_file_int"));
@@ -1022 +1023 @@
   glob_t  pglob;
 
-  int     count = 0;
+  volatile int     count = 0;
   volatile unsigned long check_mask = (flag == 0) ? sh_files_maskof(class) : check_mask_in;
   
@@ -1877 +1878 @@
 
 static void * sh_dummy_dirlist;
+static void * sh_dummy_tmpcat;
 
 /* -- Check a single directory and its content. Does not
@@ -1904 +1906 @@
   int             class  = 0;
   volatile int    rdepth_next;
-  int             class_next;
+  volatile int    class_next;
   volatile int    file_class_next;
-  unsigned long   check_mask_next;
+  volatile unsigned long   check_mask_next;
   volatile unsigned long   file_check_mask_next;
 
@@ -1921 +1923 @@
 
   SL_ENTER(_("sh_files_checkdir"));
-
-  sh_dummy_dirlist = (void *) &dirlist;
 
   if (sig_urgent > 0) {
@@ -2064 +2064 @@
   sl_strlcpy (theDir->DirPath, iname, PATH_MAX); 
 
+
+  sh_dummy_dirlist = (void *) &dirlist;
+  sh_dummy_tmpcat  = (void *) &tmpcat;
 
   /* ---- read ----
@@ -2347 +2350 @@
       {
         SH_FREE(theDir);
+        sh_dummy_dirlist = NULL;
         SL_RETURN((0), _("sh_files_checkdir"));
       }
@@ -2397 +2401 @@
   SH_FREE(tmpname);
   SH_FREE(theDir);
+
+  sh_dummy_dirlist = NULL;
 
   SL_RETURN((0), _("sh_files_checkdir"));
@@ -2686 +2692 @@
                         int * rdepth)
 {
-  int retval = 0;
+  volatile int retval = 0;
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
   sh_globstack_t * testPattern;
@@ -2757 +2763 @@
                          unsigned long *check_mask, int *reported)
 {
-  int retval = 0;
+  volatile int retval = 0;
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
   sh_globstack_t * testPattern;

trunk/src/sh_forward.c

@@ -455 +455 @@
                             _("sh_forward_send_intern: blockEncrypt"));
           memcpy(q, outBlock, B_SIZ);
-          q += B_SIZ;
+          /* q += B_SIZ; *//* never read */
         }
 
@@ -584 +584 @@
     }
   /*@-usedef +ignoresigns@*/
+  else if (msgbuf == NULL)
+    {
+      sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                      _("msgbuf is NULL"), _("sh_forward_receive_intern"));
+      SL_RETURN((-1), _("sh_forward_receive_intern"));
+    }
   else if (head[0] != protocol &&  
            (head[0] & SH_PROTO_SRP) == (char)0 /* not set */)
@@ -1666 +1672 @@
             {
               flag_err = (-1);
-              sh_error_handle((-1), FIL__, __LINE__, 0, MSG_TCP_EFIL);
+              sh_error_handle((-1), FIL__, __LINE__, flag_err, MSG_TCP_EFIL);
             }
           else
@@ -1673 +1679 @@
                */
               transfercount = 0;
-              flag_err      = 0;
+              /* flag_err      = 0; *//* never read */
 
               do {
@@ -1734 +1740 @@
               if (0 == check_request_nerr(head_u, _("EEOT")) &&
                   0 <  flag_err                             &&
-                  0 == hash_check (foo_M1, answer, (int)strlen(answer)))
+                  0 == hash_check (foo_M1, answer, (int)sl_strlen(answer)))
                 {
                   flag_err = 
@@ -1745 +1751 @@
                   (void) sl_sync(sfd);
                   if (flag_err_info == SL_TRUE)
-                    sh_error_handle((-1), FIL__, __LINE__, 0, MSG_TCP_FOK);
+                    sh_error_handle((-1), FIL__, __LINE__, flag_err, MSG_TCP_FOK);
                 }
               else
@@ -2389 +2395 @@
                                      &(conn->client_entry->keyInstE));
     }
+  else if (msg == NULL)
+    {
+      sh_error_handle((-1), FIL__, __LINE__, -1, MSG_E_SUBGEN,
+                      _("msg is NULL"), 
+                      _("sh_forward_prep_send_int: cipherInit"));
+    }
   else if ((S_TRUE == docrypt) && ((protocol & SH_PROTO_ENC) != 0) &&
            ((length2 + 1) > length2))
@@ -2431 +2443 @@
                             _("sh_forward_prep_send_int: blockEncrypt"));
           memcpy(q, outBlock, B_SIZ);
-          q += B_SIZ;
+          /* q += B_SIZ; *//* never read */
         }
 
@@ -2533 +2545 @@
   if (val <= 0)
     SL_RETURN( (-1), _("sh_forward_set_time_limit"));
-
-  val = (val < 0 ? 0 : val);
 
   time_client_limit = (time_t) val;
@@ -5142 +5152 @@
       conns[sock].fd    = sh_tcp_sock[sock];
       conns[sock].state = CONN_READING;
-      high_fd = (sh_tcp_sock[sock] > high_fd) ? sh_tcp_sock[sock] : high_fd;
+      /* high_fd = (sh_tcp_sock[sock] > high_fd) ? sh_tcp_sock[sock] : high_fd; */
       ++sock;
     }
@@ -5149 +5159 @@
   conns[sock].fd    = pf_unix_fd;
   conns[sock].state = CONN_READING;
-  high_fd = (pf_unix_fd > high_fd) ? pf_unix_fd : high_fd;
+  /* high_fd = (pf_unix_fd > high_fd) ? pf_unix_fd : high_fd; */
 
   sock_unix = sock;
@@ -5175 +5185 @@
           conns[sock].fd    = syslog_sock[s2];
           conns[sock].state = CONN_READING;
-          high_fd = (high_fd > conns[sock].fd) ? high_fd : conns[sock].fd;
+          /* high_fd = (high_fd > conns[sock].fd) ? high_fd : conns[sock].fd; */
           ++sock;
         }

trunk/src/sh_gpg.c

@@ -173 +173 @@
 
   k = 0;
-  for (i = 0; i < 127; ++i)
-    {
-      if (test_ptr2[i] == '\0')
-        break;
-      if (test_ptr2[i] != ' ')
-        {
-          wstrip2[k] = test_ptr2[i];
-          ++k;
+  if (test_ptr2)
+    {
+      for (i = 0; i < 127; ++i)
+        {
+          if (test_ptr2[i] == '\0')
+            break;
+          if (test_ptr2[i] != ' ')
+            {
+              wstrip2[k] = test_ptr2[i];
+              ++k;
+            }
         }
     }
@@ -552 +555 @@
       pfd = val_return;
       sl_close(checkfd);
-      checkfd = -1;
+      /* checkfd = -1; *//* never read */
 
       sl_snprintf(pname, sizeof(pname), _("/proc/self/fd/%d"), pfd);
@@ -815 +818 @@
         {
           sl_strlcpy (sign_id, &line[25], SH_MINIBUF+1);
-          sign_id[sl_strlen(sign_id)-1] = '\0';  /* remove trailing '"' */
+          if (sign_id)
+            sign_id[sl_strlen(sign_id)-1] = '\0';  /* remove trailing '"' */
           have_id = GOOD;
         } 
@@ -839 +843 @@
           ptr = strchr ( line, '"');
           ++ptr;
-          sl_strlcpy (sign_id, ptr, SH_MINIBUF+1);
-          sign_id[sl_strlen(sign_id)-1] = '\0'; /* remove trailing dot */
-          sign_id[sl_strlen(sign_id)-2] = '\0'; /* remove trailing '"' */
+          if (ptr)
+            {
+              sl_strlcpy (sign_id, ptr, SH_MINIBUF+1);
+              sign_id[sl_strlen(sign_id)-1] = '\0'; /* remove trailing dot */
+              sign_id[sl_strlen(sign_id)-2] = '\0'; /* remove trailing '"' */
+            }
+          else
+            {
+              sl_strlcpy (sign_id, _("(null)"), SH_MINIBUF+1);
+            }
           have_id = GOOD;
         }

trunk/src/sh_hash.c

@@ -600 +600 @@
                 prev->next = p->next;
 
-              p = delete_db_entry(p);
+              delete_db_entry(p);
 
               SL_RET0(_("hash_unvisited"));
@@ -693 +693 @@
             entries.prev->next = p->next;
           
-          p = delete_db_entry(p);
+          delete_db_entry(p);
           
           goto end;
@@ -915 +915 @@
               SL_RET0(_("hashinsert"));
             }
-          else 
-            if (p->next == NULL) 
-              {
-                p->next = s;
-                p->next->next = NULL;
-                SL_RET0(_("hashinsert"));
-              }
-          p = p->next;
+          else if (p && p->next == NULL) 
+            {
+              p->next = s;
+              p->next->next = NULL;
+              SL_RET0(_("hashinsert"));
+            }
+          if (p)
+            p = p->next;
+          else /* cannot really happen, but llvm/clang does not know */
+            break;
         }
     }
@@ -1470 +1472 @@
   sl_close (fd);
   sh_hash_getline_end();
-  fd = -1;
+  /* fd = -1; */
 
  unlock_and_return:

trunk/src/sh_html.c

@@ -158 +158 @@
 #endif
           if (time_ptr != NULL) 
-            status = strftime (ts1, 80, _("%d-%m-%Y %H:%M:%S"), time_ptr);
+            strftime (ts1, 80, _("%d-%m-%Y %H:%M:%S"), time_ptr);
           now = time(NULL);
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R)
@@ -166 +166 @@
 #endif
           if (time_ptr != NULL) 
-            status = strftime (ts2, 80, _("%d-%m-%Y %H:%M:%S"), time_ptr);
+            strftime (ts2, 80, _("%d-%m-%Y %H:%M:%S"), time_ptr);
 
           sl_snprintf(outline, 1023, 
@@ -192 +192 @@
 #endif
               if (time_ptr != NULL) 
-                status = strftime (ts1, 80, _("%d-%m-%Y %H:%M:%S"), time_ptr);
+                strftime (ts1, 80, _("%d-%m-%Y %H:%M:%S"), time_ptr);
               sl_snprintf(outline, 1023, 
                           _("<p>Last connection at %s</p>"), 
@@ -323 +323 @@
             {
               entry_size = 0;
-              add_size   = 0;
+              /* add_size   = 0; *//* never read */
               SL_RETURN( 0, _("sh_html_get_entry"));
             }

trunk/src/sh_inotify.c

@@ -388 +388 @@
   SH_MUTEX_UNLOCK(mutex_list_dormant);
 
+  sh_dummy_popret = NULL;
   return popret;
 }

trunk/src/sh_log_evalrule.c

@@ -635 +635 @@
   if (pflag == 'K')
     {
-      nr->label   = sh_string_new_from_lchar(dstr, strlen(dstr));
+      nr->label   = sh_string_new_from_lchar(dstr, sl_strlen(dstr));
       nr->flags  |= RFL_KEEP;
       nr->delay   = dsec;
@@ -642 +642 @@
   else if (pflag == 'M')
     {
-      nr->label   = sh_string_new_from_lchar(dstr, strlen(dstr));
+      nr->label   = sh_string_new_from_lchar(dstr, sl_strlen(dstr));
       nr->flags  |= RFL_MARK;
       nr->delay   = dsec;
@@ -919 +919 @@
     DEBUG("debug: no match found\n");
   /* If there was no match, this is NULL */
+  dummy1 = NULL;
   return rule;
 }
@@ -993 +994 @@
       } while (group);
     }
+
+  dummy2 = NULL;
+  dummy3 = NULL;
   return result;
 }

trunk/src/sh_login_track.c

@@ -298 +298 @@
           while (entry)
             {
-              n = fwrite(&(entry->data), sizeof(struct sh_track_entry_data), 1, fp);
+              fwrite(&(entry->data), sizeof(struct sh_track_entry_data), 
+                     1, fp);
               entry = entry->next;
             }
@@ -426 +427 @@
     }
 
-  while (*p && (*p == ' ' || *p == '\t')) ++p;
-
-  if (*p && (i < SH_LTRACK_USIZE) && (*p == ':'))
+  while (p && *p && (*p == ' ' || *p == '\t')) ++p;
+
+  if (p && *p && (i < SH_LTRACK_USIZE) && (*p == ':'))
     {
       user[i] = '\0';
@@ -970 +971 @@
 
   urecord    = load_data(user);
-  last_login = (urecord->head).last_login;
-
-  urecord = load_data(user);
   last_login = (urecord->head).last_login;
 

trunk/src/sh_mail.c

@@ -458 +458 @@
 }
 
-void sh_mail_signature_block (sh_string  * sigMsg, char * recipient,
-                              char * bufcompress)
+sh_string * sh_mail_signature_block (sh_string  * sigMsg, char * recipient,
+                                     char * bufcompress)
 {
   time_t         id_audit;
@@ -511 +511 @@
     sigMsg     = sh_string_add_from_char(sigMsg, _("-----END MESSAGE-----"));
 
-    return;
+    return sigMsg;
 }
 
@@ -599 +599 @@
      * how to filter messages. */
 
-    theMsg = sh_string_new_from_lchar(message, strlen(message));
+    theMsg = sh_string_new_from_lchar(message, sl_strlen(message));
+    if (!theMsg)
+      {
+        SL_RETURN((-1), _("sh_mail_msg"));
+      }
 
     /* ---------- Header  ---------------------------------------- */
@@ -694 +698 @@
                         sh_string  * sigMsg  = sh_string_new (0);
 
-                        sh_mail_signature_block (sigMsg, 
-                                                 sh_string_str(address_list->recipient),
-                                                 bufcompress);
+                        sigMsg = sh_mail_signature_block (sigMsg, 
+                                                          sh_string_str(address_list->recipient),
+                                                          bufcompress);
 
                         wrlen = fwrite (sh_string_str(sigMsg), 1, 
@@ -746 +750 @@
                 sh_string  * sigMsg  = sh_string_new (0);
                 
-                sh_mail_signature_block (sigMsg, 
-                                         NULL,
-                                         bufcompress);
+                sigMsg  = sh_mail_signature_block (sigMsg, 
+                                                   NULL,
+                                                   bufcompress);
                 
                 wrlen = fwrite (sh_string_str(sigMsg), 1, 
@@ -774 +778 @@
               }
 
-            sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_SRV_FAIL,
-                             _("mail"), sh_string_str(ma_address->recipient));
+            if (ma_address)
+              sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_SRV_FAIL,
+                               _("mail"), 
+                               sh_string_str(ma_address->recipient));
             errcount = address_num;
             ++sh.statistics.mail_failed;
@@ -1652 +1658 @@
     }
 
-  ret = 0;
+
   header  = (HEADER *) reply;
 
@@ -1753 +1759 @@
       /* CLASS (re-use 'type' var)
        */
-      type = get_short (comp_dn);
+      /* type = get_short (comp_dn); *//* don't care */
       comp_dn += 2;
       if (comp_dn >= eom)

trunk/src/sh_portcheck.c

@@ -605 +605 @@
       ptr = ptr->next;
     }
+
+  sh_dummy_ptr = NULL;
+  sh_dummy_pre = NULL;
+
   return;
 }
@@ -1546 +1550 @@
   } while (*str);
 
+  sh_dummy_str = NULL;
   return 0;
 }
@@ -1653 +1658 @@
         {
           if (portchk_debug)
-            fprintf(stderr, _("add_required_port\n"));
+            fprintf(stderr, _("add_required_port %d\n"), (int) port);
           sh_portchk_add_to_list (proto,   -1, &saddr,  buf, type, SH_PORT_UNKN);
         }

trunk/src/sh_processcheck.c

@@ -460 +460 @@
       list = list->next;
     }
+
+  sh_dummy_watchlist = NULL;
+  return;
 }
 
@@ -518 +521 @@
   SL_ENTER(_("sh_prochk_set_pspath"));
 
-  if (!str && ('/' != str[0]))
+  if (!str || ('/' != str[0]))
     SL_RETURN((-1), _("sh_prochk_set_pspath"));
   if (sh_prochk_pspath)

trunk/src/sh_readconf.c

@@ -142 +142 @@
   while (tmp && isspace((int)*tmp)) ++tmp;
   
-  if (tmp[0] == '$' && tmp[1] == '(')
+  if (tmp && tmp[0] == '$' && tmp[1] == '(')
     {
       size_t len = strlen(tmp);

trunk/src/sh_restrict.c

@@ -107 +107 @@
   SL_ENTER(_("matches_prefix"));
 
-  path_len = sl_strlen(path);
-  pref_len = sl_strlen(prefix);
-  
-  if (path_len >= pref_len)
-    {
-      if (0 == strncmp(path, prefix, pref_len))
-        {
-          SL_RETURN(1, _("matches_prefix"));
+  if (path && prefix)
+    {
+      path_len = sl_strlen(path);
+      pref_len = sl_strlen(prefix);
+      
+      if (path_len >= pref_len)
+        {
+          if (0 == strncmp(path, prefix, pref_len))
+            {
+              SL_RETURN(1, _("matches_prefix"));
+            }
         }
     }

trunk/src/sh_socket.c

@@ -997 +997 @@
                    (struct sockaddr *) & name, size);
   */
-  nbytes = send (talkfd, _("END"), 4, 0);
+  /* nbytes = *//* never read */ send (talkfd, _("END"), 4, 0);
   sl_close_fd(FIL__, __LINE__, talkfd);
   return 0;

trunk/src/sh_string.c

@@ -47 +47 @@
       if (*s) 
         {
-          a = s;
-
           /* move a to next delim
            */
@@ -257 +255 @@
   char * s = line;
   char * p;
+  unsigned int sind = (prefix) ? strlen(prefix) : 0;
 
   while ( *s && isspace((int)*s) ) ++s;
   if (prefix && 0 != strncmp(s, prefix, strlen(prefix)))
     return NULL;
-  s = &s[strlen(prefix)];
+  s = &s[sind];
   while ( *s && isspace((int)*s) ) ++s;
   if (!s || (*s != '('))
@@ -437 +436 @@
   s      = SH_ALLOC(sizeof(sh_string));
   s->str = SH_ALLOC(len+1);
-  memcpy(s->str, str, len);
+  if (str)
+    memcpy(s->str, str, len);
+  else
+    s->str[0] = '\0';
   s->str[len] = '\0';
   s->siz = len+1;
@@ -599 +601 @@
 
   curr = -1;
-  last = -1;
 
   for (i = 0; i < ovecnum; ++i)

trunk/src/sh_suidchk.c

@@ -927 +927 @@
           SH_FREE(tmp);
           SH_FREE(msg);
-          cperm_status = -1;
         }
     }
@@ -1539 +1538 @@
   ShSuidchkExclude = sh_util_strdup (c);
   ExcludeLen       = sl_strlen (ShSuidchkExclude);
-  if (ShSuidchkExclude[ExcludeLen-1] == '/')
+  if (ShSuidchkExclude && ShSuidchkExclude[ExcludeLen-1] == '/')
     {
       ShSuidchkExclude[ExcludeLen-1] = '\0';

trunk/src/sh_tiger0.c

@@ -287 +287 @@
         sh.statistics.bytes_hashed += tt;
         
-        bptr = buffer; tt = 0;
+        tt = 0;
         for (i = 0; i < blk; ++i)
           {
@@ -366 +366 @@
         /* MAY_LOCK */
         sh.statistics.bytes_hashed += 64;
-        ++nblocks; ncount = 0;
+        ++nblocks; 
+#ifdef TIGER_DBG
+        ncount = 0;
+#endif
         sl_memset(bbuf, 0, 56 ); 
       }

trunk/src/sh_tools.c

@@ -339 +339 @@
             break;
 
-          c = *p;
+
 
           switch (*p) {
@@ -516 +516 @@
 {
   sin_cache * check_cache = conn_cache;
-  sin_cache * old_entry   = conn_cache;
+  sin_cache * old_entry;
 
   SL_ENTER(_("delete_cache"));

trunk/src/sh_unix.c

@@ -1108 +1108 @@
   int    status;
   int    level;
-  uid_t  ff_euid;
+  uid_t  ff_euid = (uid_t) -1;
 
   SL_ENTER(_("tf_trust_check"));
@@ -1136 +1136 @@
           aud_exit (FIL__, __LINE__, EXIT_FAILURE);
         }
-      ff_euid = tempres->pw_uid;
+      else
+        {
+          ff_euid = tempres->pw_uid;
+        }
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
       SH_FREE(buffer);
@@ -2623 +2626 @@
 static void sh_userid_additem(struct user_id * list, struct user_id * item)
 {
-  while (list && list->next)
-    list = list->next;
-  list->next = item;
+  if (list)
+    {
+      while (list && list->next)
+        list = list->next;
+      list->next = item;
+    }
   return;
 }

trunk/src/sh_utmp.c

@@ -872 +872 @@
   SL_ENTER(_("sh_utmp_addlogin"));
 
+  if (ut->ut_line[0] == '\0')
+    SL_RET0(_("sh_utmp_addlogin"));
+
+  /* for some stupid reason, AIX repeats the wtmp entry for logouts
+   * with ssh
+   */
+  if (memcmp (&save_utmp, ut, sizeof(struct SH_UTMP_S)) == 0)
+    {
+      memset(&save_utmp, (int) '\0', sizeof(struct SH_UTMP_S));
+      SL_RET0(_("sh_utmp_addlogin"));
+    }
+  memcpy (&save_utmp, ut, sizeof(struct SH_UTMP_S));
+
   /* Take the address to keep gcc from putting them into registers. 
    * Avoids the 'clobbered by longjmp' warning. 
@@ -877 +890 @@
   sh_dummy_userold = (void*) &userold;
   sh_dummy_user    = (void*) &user;
-
-  if (ut->ut_line[0] == '\0')
-    SL_RET0(_("sh_utmp_addlogin"));
-
-  /* for some stupid reason, AIX repeats the wtmp entry for logouts
-   * with ssh
-   */
-  if (memcmp (&save_utmp, ut, sizeof(struct SH_UTMP_S)) == 0)
-    {
-      memset(&save_utmp, (int) '\0', sizeof(struct SH_UTMP_S));
-      SL_RET0(_("sh_utmp_addlogin"));
-    }
-  memcpy (&save_utmp, ut, sizeof(struct SH_UTMP_S));
-
 
   /* ------- find user -------- 
@@ -993 +992 @@
       
       sh_utmp_login_morechecks(ut);
-      SL_RET0(_("sh_utmp_addlogin"));
+      goto out;
     }
 
@@ -1052 +1051 @@
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
         }
-      SL_RET0(_("sh_utmp_addlogin"));
+      goto out;
     }
 
   /* default */
-  SL_RET0(_("sh_utmp_addlogin"));
+  goto out;
 
   /* #ifdef HAVE_UTTYPE                   */
@@ -1136 +1135 @@
     }
 
+#endif
+
+ out:
+  sh_dummy_user    = NULL;
+  sh_dummy_userold = NULL;
+
   SL_RET0(_("sh_utmp_addlogin"));
-#endif
 }
 
@@ -1214 +1218 @@
     {
       while (this_read < lastread) {
-        ut = sh_utmp_getutent();
+        (void) sh_utmp_getutent();
         ++this_read;
       }

trunk/src/slib.c

@@ -931 +931 @@
   else if (src == NULL)
     {
-      if (siz > 0) 
+      if (dst && siz > 0) 
         dst[0] = '\0';
       return SL_ENONE;
@@ -2835 +2835 @@
    */
   bytecount    = 0;
-  bytewritten  = 0;
+
   while (bytecount < nbytes) 
     {    
-      if ((bytewritten = write (fd, msg, nbytes-bytecount)) > 0) 
+      bytewritten = write (fd, msg, nbytes-bytecount);
+
+      if (bytewritten > 0) 
         {
           bytecount += bytewritten;

trunk/src/zAVLTree.c

@@ -366 +366 @@
   depthdiff = R_DEPTH(avlnode) - L_DEPTH(avlnode);
 
-  if (depthdiff <= -2) {
+  if (depthdiff <= -2 && avlnode->left) {
     child = avlnode->left;
 
@@ -384 +384 @@
     else {
       gchild = child->right;
-      avlnode->left = gchild->right;
-      if (avlnode->left != NULL)
-        avlnode->left->parent = avlnode;
-      avlnode->depth = CALC_DEPTH(avlnode);
-      child->right = gchild->left;
-      if (child->right != NULL)
-        child->right->parent = child;
-      child->depth = CALC_DEPTH(child);
-      gchild->right = avlnode;
-      if (gchild->right != NULL)
-        gchild->right->parent = gchild;
-      gchild->left = child;
-      if (gchild->left != NULL)
-        gchild->left->parent = gchild;
-      gchild->depth = CALC_DEPTH(gchild);
-      *superparent = gchild;
-      gchild->parent = origparent;
-    }
-  }
-
-  else if (depthdiff >= 2) {
+      if (gchild)
+        {
+          avlnode->left = gchild->right;
+          if (avlnode->left != NULL)
+            avlnode->left->parent = avlnode;
+          avlnode->depth = CALC_DEPTH(avlnode);
+          child->right = gchild->left;
+          if (child->right != NULL)
+            child->right->parent = child;
+          child->depth = CALC_DEPTH(child);
+          gchild->right = avlnode;
+          if (gchild->right != NULL)
+            gchild->right->parent = gchild;
+          gchild->left = child;
+          if (gchild->left != NULL)
+            gchild->left->parent = gchild;
+          gchild->depth = CALC_DEPTH(gchild);
+          *superparent = gchild;
+          gchild->parent = origparent;
+        }
+    }
+  }
+
+  else if (depthdiff >= 2 && avlnode->right) {
     child = avlnode->right;
 
@@ -422 +425 @@
     else {
       gchild = child->left;
-      avlnode->right = gchild->left;
-      if (avlnode->right != NULL)
-        avlnode->right->parent = avlnode;
-      avlnode->depth = CALC_DEPTH(avlnode);
-      child->left = gchild->right;
-      if (child->left != NULL)
-        child->left->parent = child;
-      child->depth = CALC_DEPTH(child);
-      gchild->left = avlnode;
-      if (gchild->left != NULL)
-        gchild->left->parent = gchild;
-      gchild->right = child;
-      if (gchild->right != NULL)
-        gchild->right->parent = gchild;
-      gchild->depth = CALC_DEPTH(gchild);
-      *superparent = gchild;
-      gchild->parent = origparent;
+      if (gchild)
+        {
+          avlnode->right = gchild->left;
+          if (avlnode->right != NULL)
+            avlnode->right->parent = avlnode;
+          avlnode->depth = CALC_DEPTH(avlnode);
+          child->left = gchild->right;
+          if (child->left != NULL)
+            child->left->parent = child;
+          child->depth = CALC_DEPTH(child);
+          gchild->left = avlnode;
+          if (gchild->left != NULL)
+            gchild->left->parent = gchild;
+          gchild->right = child;
+          if (gchild->right != NULL)
+            gchild->right->parent = gchild;
+          gchild->depth = CALC_DEPTH(gchild);
+          *superparent = gchild;
+          gchild->parent = origparent;
+        }
     }
   }