Fix the filename size

Author: zwoop

plugins/healthchecks/healthchecks.cc

@@ -64,7 +64,7 @@ typedef struct HCFileData_t {
 typedef struct HCFileInfo_t {
   char fname[MAX_PATH_LEN];       /* Filename */
   char *basename;                 /* The "basename" of the file */
-  unsigned basename_len;          /* The length of the basename */
+  unsigned basename_len = 0;      /* The length of the basename */
   char path[PATH_NAME_MAX];       /* URL path for this HC */
   int p_len;                      /* Length of path */
   const char *ok;                 /* Header for an OK result */
@@ -137,7 +137,7 @@ setup_watchers(int fd)
   while (conf) {
     conf->wd = inotify_add_watch(fd, conf->fname, IN_DELETE_SELF | IN_CLOSE_WRITE | IN_ATTRIB);
     TSDebug(PLUGIN_NAME, "Setting up a watcher for %s", conf->fname);
-    strncpy(fname, conf->fname, MAX_PATH_LEN);
+    strncpy(fname, conf->fname, MAX_PATH_LEN - 1);
     char *dname = dirname(fname);
     /* Make sure to only watch each directory once */
     if (!(dir = find_direntry(dname, head_dir))) {
@@ -322,56 +322,59 @@ parse_configs(const char *fname)
               ++str;
             }
             strncpy(finfo->path, str, PATH_NAME_MAX - 1);
-            finfo->p_len = strlen(finfo->path);
+            finfo->path[PATH_NAME_MAX - 1] = '\0';
+            finfo->p_len                   = strlen(finfo->path);
             break;
           case 1:
             strncpy(finfo->fname, str, MAX_PATH_LEN - 1);
-            finfo->basename = strrchr(finfo->fname, '/');
+            finfo->fname[MAX_PATH_LEN - 1] = '\0';
+            finfo->basename                = strrchr(finfo->fname, '/');
             if (finfo->basename) {
               ++(finfo->basename);
+              finfo->basename_len = strlen(finfo->basename);
             }
-            finfo->basename_len = strlen(finfo->basename);
-            break;
-          case 2:
-            mime = str;
-            break;
-          case 3:
-            ok = str;
-            break;
-          case 4:
-            miss = str;
-            break;
           }
-          ++state;
+          break;
+        case 2:
+          mime = str;
+          break;
+        case 3:
+          ok = str;
+          break;
+        case 4:
+          miss = str;
+          break;
         }
-        str = strtok_r(nullptr, SEPARATORS, &save);
+        ++state;
       }
+      str = strtok_r(nullptr, SEPARATORS, &save);
+    }
 
-      /* Fill in the info if everything was ok */
-      if (state > 4) {
-        TSDebug(PLUGIN_NAME, "Parsed: %s %s %s %s %s", finfo->path, finfo->fname, mime, ok, miss);
-        finfo->ok   = gen_header(ok, mime, &finfo->o_len);
-        finfo->miss = gen_header(miss, mime, &finfo->m_len);
-        finfo->data = tsapi::malloc<HCFileData>();
-        memset(finfo->data, 0, sizeof(HCFileData));
-        reload_status_file(finfo, finfo->data);
-
-        /* Add it the linked list */
-        TSDebug(PLUGIN_NAME, "Adding path=%s to linked list", finfo->path);
-        if (nullptr == head_finfo) {
-          head_finfo = finfo;
-        } else {
-          prev_finfo->_next = finfo;
-        }
-        prev_finfo = finfo;
+    /* Fill in the info if everything was ok */
+    if (state > 4) {
+      TSDebug(PLUGIN_NAME, "Parsed: %s %s %s %s %s", finfo->path, finfo->fname, mime, ok, miss);
+      finfo->ok   = gen_header(ok, mime, &finfo->o_len);
+      finfo->miss = gen_header(miss, mime, &finfo->m_len);
+      finfo->data = tsapi::malloc<HCFileData>();
+      memset(finfo->data, 0, sizeof(HCFileData));
+      reload_status_file(finfo, finfo->data);
+
+      /* Add it the linked list */
+      TSDebug(PLUGIN_NAME, "Adding path=%s to linked list", finfo->path);
+      if (nullptr == head_finfo) {
+        head_finfo = finfo;
       } else {
-        TSfree(finfo);
+        prev_finfo->_next = finfo;
       }
+      prev_finfo = finfo;
+    } else {
+      TSfree(finfo);
     }
   }
-  fclose(fd);
+}
+fclose(fd);
 
-  return head_finfo;
+return head_finfo;
 }
 
 /* Cleanup after intercept has completed */