Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 21:21:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4081_dev747368_containerfilesymbolserver_pdb_byteprovider--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-12-01 11:31:14 -05:00
parent fb24b25569 43c3ca87aa
commit b849ffb873
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/PDB/src/main/java/pdb/symbolserver/ContainerFileSymbolServer.java
+10 -22
View File
@@ -15,14 +15,14 @@
*/
package pdb.symbolserver;
import java.io.*;
import java.nio.file.Files;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Set;
import org.apache.commons.io.FilenameUtils;
import ghidra.app.util.bin.ByteProvider;
import ghidra.app.util.bin.format.pdb2.pdbreader.*;
import ghidra.formats.gfilesystem.*;
import ghidra.util.exception.CancelledException;
import ghidra.util.task.TaskMonitor;
@@ -96,31 +96,19 @@ public class ContainerFileSymbolServer implements SymbolServer {
TaskMonitor monitor) {
try (RefdFile fref = getFile(fileInfo.getName(), monitor)) {
// TODO: need to be able to read info from candidate pdb file using some type of stream
if (fref != null) {
GFile file = fref.file;
GFileSystem fs = file.getFilesystem();
try (ByteProvider bp = fs.getByteProvider(file, monitor)) {
File tmpPdbFile = fsService.createPlaintextTempFile(bp, "temp_pdb", monitor);
File tmpPdbDir =
Files.createTempDirectory(tmpPdbFile.getParentFile().toPath(), "temp_pdb")
.toFile();
File destPdbFile = new File(tmpPdbDir, file.getName()).getCanonicalFile();
if (!destPdbFile.getParentFile().equals(tmpPdbDir)) {
throw new IOException("Bad filename: " + destPdbFile);
}
if (!tmpPdbFile.renameTo(destPdbFile)) {
throw new IOException(
"Unable to move file: " + tmpPdbFile + " to " + destPdbFile);
}
SymbolFileInfo foundInfo = SymbolFileInfo.fromFile(destPdbFile, monitor);
destPdbFile.delete();
tmpPdbDir.delete();
return List.of(new SymbolFileLocation(file.getName(), this, foundInfo));
try (AbstractPdb pdb = PdbParser.parse(fs.getByteProvider(file, monitor),
new PdbReaderOptions(), monitor)) {
PdbIdentifiers pdbIdent = pdb.getIdentifiers();
SymbolFileInfo foundInfo =
SymbolFileInfo.fromPdbIdentifiers(file.getName(), pdbIdent);
return List.of(new SymbolFileLocation(fileInfo.getName(), this, foundInfo));
}
}
}
catch (IOException | CancelledException e) {
catch (Exception e) {
// fall thru
}
return List.of();