jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix: check and report invalid magic in '.dex' files (#2473)

Browse Source
This commit is contained in:
Skylot
2025-05-03 21:31:59 +01:00
parent a796d15289
commit e31d697cd9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+1
View File
@@ -624,6 +624,7 @@ public class MainWindow extends JFrame {
showLogViewer(LogOptions.allWithLevel(Level.ERROR));
}
} else {
showLogViewer(LogOptions.allWithLevel(Level.WARN));
UiUtils.showMessageBox(this, NLS.str("message.no_classes"));
}
}
jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexFileLoader.java
+9 -1
View File
@@ -6,6 +6,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
@@ -18,6 +19,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jadx.api.plugins.utils.CommonFileUtils;
import jadx.core.utils.files.FileUtils;
import jadx.plugins.input.dex.sections.DexConsts;
import jadx.plugins.input.dex.sections.DexHeaderV41;
import jadx.plugins.input.dex.utils.DexCheckSum;
@@ -69,11 +71,17 @@ public class DexFileLoader {
if (in.read(magic) != magic.length) {
return Collections.emptyList();
}
if (isStartWithBytes(magic, DexConsts.DEX_FILE_MAGIC) || fileName.endsWith(".dex")) {
if (isStartWithBytes(magic, DexConsts.DEX_FILE_MAGIC)) {
in.reset();
byte[] content = readAllBytes(in);
return loadDexReaders(fileName, content);
}
if (fileName.endsWith(".dex")) {
// report invalid magic in '.dex' file
String hex = FileUtils.bytesToHex(magic);
String str = new String(magic, StandardCharsets.US_ASCII);
LOG.warn("Invalid DEX magic: 0x{}(\"{}\") in file: {}", hex, str, fileName);
}
if (file != null) {
// allow only top level zip files
if (isStartWithBytes(magic, DexConsts.ZIP_FILE_MAGIC) || CommonFileUtils.isZipFileExt(fileName)) {