mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-02-07 19:20:14 +00:00
Merge remote-tracking branch 'origin/GP-2550_dev747368_improve_pdb_symbolstore_000admin_directory_handling'
This commit is contained in:
commit
b0bddda320
@ -15,11 +15,12 @@
|
||||
*/
|
||||
package pdb.symbolserver;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
@ -254,8 +255,13 @@ public class SymbolServerService {
|
||||
|
||||
if (SymbolStore.isCompressedFilename(symbolFileLocation.getPath())) {
|
||||
File cabFile = localSymbolStore.getFile(symbolFileLocation.getPath());
|
||||
File temporaryExtractFile = new File(symbolStore.getAdminDir(),
|
||||
"ghidra_cab_extract_tmp_" + System.currentTimeMillis());
|
||||
File adminDir = symbolStore.getAdminDir();
|
||||
if (!adminDir.isDirectory()) {
|
||||
// if the admin dir is missing, use the cab file's directory
|
||||
adminDir = cabFile.getParentFile();
|
||||
}
|
||||
File temporaryExtractFile =
|
||||
new File(adminDir, "ghidra_cab_extract_tmp_" + System.currentTimeMillis());
|
||||
|
||||
Msg.debug(this,
|
||||
logPrefix() + ": decompressing file " + symbolFileLocation.getLocationStr());
|
||||
|
Loading…
Reference in New Issue
Block a user