mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-04-10 09:27:23 -04:00
parent 1044bf5f7e 9b5080adcf
commit b5e404f499
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ProjectIndexService.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +20,7 @@ import java.util.*;
import java.util.function.BiFunction;
import ghidra.formats.gfilesystem.FSRL;
import ghidra.framework.main.datatable.ProjectDataTablePanel;
import ghidra.framework.model.*;
import ghidra.util.Swing;
import ghidra.util.task.TaskMonitor;
@@ -119,7 +120,7 @@ public class ProjectIndexService implements DomainFolderChangeListener {
private void indexProject(ProjectData projectData, TaskMonitor monitor) {
int fileCount = projectData.getFileCount();
if (fileCount < 0) {
if (fileCount < 0 || fileCount > ProjectDataTablePanel.MAX_FILE_COUNT) {
return;
}
monitor.initialize(fileCount, "Indexing Project Metadata");

4
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatable/ProjectDataTablePanel.java
View File

@@ -45,7 +45,7 @@ public class ProjectDataTablePanel extends JPanel {
private static final String MAX_FILE_COUNT_PROPERTY = "ProjectDataTable.maxFileCount";
private static final int MAX_FILE_COUNT_DEFAULT = 2000;
private static int maxFileCount = loadMaxFileCount();
public static final int MAX_FILE_COUNT = loadMaxFileCount();
private FrontEndPlugin plugin;
private PluginTool tool;
@@ -190,7 +190,7 @@ public class ProjectDataTablePanel extends JPanel {
int fileCount = projectData.getFileCount();
if (fileCount < 0 || fileCount > maxFileCount) {
if (fileCount < 0 || fileCount > MAX_FILE_COUNT) {
capacityExceeded = true;
this.projectData.removeDomainFolderChangeListener(changeListener);
model.setProjectData(null);