mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Log error when populate FID has language mismatch (Closes #9287)

Browse Source
This commit is contained in:
Ryan Kurtz
2026-06-24 14:22:18 -04:00
parent 3b22c3a068
commit 6f1a6eaae1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/service/FidServiceLibraryIngest.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -74,7 +74,6 @@ class FidServiceLibraryIngest {
* @param name the name * @param name the name
* @param hashQuad the hash quad of the function * @param hashQuad the hash quad of the function
* @param hasTerminator whether the function body contains a terminating flow * @param hasTerminator whether the function body contains a terminating flow
* @return the new function row
*/ */
public FunctionRow(DomainFile domainFile, Function function, String name, public FunctionRow(DomainFile domainFile, Function function, String name,
FidHashQuad hashQuad, boolean hasTerminator) { FidHashQuad hashQuad, boolean hasTerminator) {
@@ -199,7 +198,8 @@ class FidServiceLibraryIngest {
/** /**
* Mark a set of function symbols as "very common" so a match relationship won't be generated with * Mark a set of function symbols as "very common" so a match relationship won't be generated with
* functions that call it. * functions that call it.
* @param symbols *
* @param symbols The symbols
*/ */
public void markCommonChildReferences(List<String> symbols) { public void markCommonChildReferences(List<String> symbols) {
if (symbols == null) { if (symbols == null) {
@@ -259,7 +259,7 @@ class FidServiceLibraryIngest {
/** /**
* Processes a single program, adding it to the library. * Processes a single program, adding it to the library.
* @param result the populate result *
* @param program the program * @param program the program
* @throws CancelledException if the user cancels * @throws CancelledException if the user cancels
*/ */
@@ -323,7 +323,7 @@ class FidServiceLibraryIngest {
/** /**
* Hashes all the functions in the program for inserting into the database. * Hashes all the functions in the program for inserting into the database.
* @param result the populate result *
* @param program the program * @param program the program
* @param hasher the FID hasher * @param hasher the FID hasher
* @param theFunctions the functions * @param theFunctions the functions
@@ -598,6 +598,8 @@ class FidServiceLibraryIngest {
*/ */
private boolean checkLanguageCompilerSpec(Program program) { private boolean checkLanguageCompilerSpec(Program program) {
if (!languageId.equals(program.getLanguageID())) { if (!languageId.equals(program.getLanguageID())) {
Msg.error(this,
"Program " + program.getName() + " does not have language " + languageId);
return false; return false;
} }
if (compilerSpec != null) { if (compilerSpec != null) {