Merge pull request #8719 from MegaMek/fix/academy-curriculum-index-bounds-check

HammerGS · web-flow · commit 781fb538d0fa · 2026-02-03T20:58:15.000-07:00
Fix IndexOutOfBoundsException in Academy.getTooltip() for mismatched curriculum data (Sentry)
diff --git a/MekHQ/src/mekhq/campaign/personnel/education/Academy.java b/MekHQ/src/mekhq/campaign/personnel/education/Academy.java
@@ -549,6 +549,26 @@ public List<Integer> getQualificationStartYears() {
         return qualificationStartYears;
     }
 
+    /**
+     * Validates that the parallel lists (qualifications, curriculums, qualificationStartYears) have matching sizes.
+     * Logs a warning if they don't match.
+     *
+     * @return true if lists are valid (same size or all null/empty), false if mismatched
+     */
+    public boolean validateListSizes() {
+        int qualCount = (qualifications == null) ? 0 : qualifications.size();
+        int currCount = (curriculums == null) ? 0 : curriculums.size();
+        int yearCount = (qualificationStartYears == null) ? 0 : qualificationStartYears.size();
+
+        if (qualCount != currCount || qualCount != yearCount) {
+            LOGGER.warn("Academy '{}' has mismatched list sizes: qualifications={}, curriculums={}, startYears={}. "
+                              + "This may cause errors when viewing course tooltips.",
+                  name, qualCount, currCount, yearCount);
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Retrieves the base skill level granted by this academy.
      *
@@ -812,6 +832,13 @@ public String getTooltip(Campaign campaign, List<Person> personnel, int courseIn
               MekHQ.getMHQOptions().getLocale());
 
         try {
+            // Bounds check: ensure courseIndex is valid for curriculums list
+            if (curriculums == null || courseIndex < 0 || courseIndex >= curriculums.size()) {
+                LOGGER.error("Invalid courseIndex {} for academy '{}' with {} curriculums",
+                      courseIndex, name, curriculums == null ? 0 : curriculums.size());
+                return "<html><body style='width: 200px'><i>Error: Invalid course data</i></body></html>";
+            }
+
             StringBuilder tooltip = new StringBuilder().append("<html><body style='width: 200px'>");
             tooltip.append("<i>").append(description).append("</i><br><br>");
             tooltip.append("<b>").append(resources.getString("curriculum.text")).append("</b><br>");
diff --git a/MekHQ/src/mekhq/campaign/personnel/education/AcademyFactory.java b/MekHQ/src/mekhq/campaign/personnel/education/AcademyFactory.java
@@ -140,6 +140,12 @@ public void loadAcademyFromStream(InputStream inputStream, String fileName) {
                 academy.setId(id);
                 id++;
                 academy.setSet(currentSetName);
+                // Validate that parallel lists have matching sizes, skip invalid academies
+                if (!academy.validateListSizes()) {
+                    LOGGER.warn("Skipping academy '{}' in set '{}' from file '{}' due to invalid list sizes.",
+                          academy.getName(), currentSetName, fileName);
+                    continue;
+                }
                 tempAcademyMap.put(academy.getName(), academy);
             }
             academyMap.put(currentSetName, tempAcademyMap);
