Sort files list in FileDirectory::loadAll() #3657
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This lets us assemble classes.dex in a reproducible manner. Test: apktool d test.apk > /dev/null apktool b test > /dev/null sha1sum test/build/apk/classes.dex apktool -f d test.apk > /dev/null apktool b test > /dev/null sha1sum test/build/apk/classes.dex
|
Do you have a sample application that isn't the same? Running a few of my samples through and its the same every time. |
Here you go. |
|
What hash do you get with that sample? |
|
|
Thanks. I don't see anything dangerous with this merge, I'm just trying to understand how this is happening and I can't replicate. |
Also, with the following diff applied: diff --git a/brut.j.dir/src/main/java/brut/directory/FileDirectory.java b/brut.j.dir/src/main/java/brut/directory/FileDirectory.java
index fd6e88a5..0981693f 100644
--- a/brut.j.dir/src/main/java/brut/directory/FileDirectory.java
+++ b/brut.j.dir/src/main/java/brut/directory/FileDirectory.java
@@ -109,8 +109,21 @@ public class FileDirectory extends AbstractDirectory {
mDirs = new LinkedHashMap<>();
File[] files = getDir().listFiles();
+
+ for (File file : files) {
+ if (file.isFile()) {
+ System.out.println("[pre-sort] " + file.getName());
+ }
+ }
+
Arrays.sort(files, Comparator.comparing(f -> f.getName()));
+ for (File file : files) {
+ if (file.isFile()) {
+ System.out.println("[post-sort] " + file.getName());
+ }
+ }
+
for (File file : files) {
if (file.isFile()) {
mFiles.add(file.getName());(diff between both executions) --- a 2024-08-07 13:02:48.910824438 +0200
+++ b 2024-08-07 13:02:53.798824914 +0200
@@ -1,6 +1,6 @@
-[pre-sort] IBase$Stub.smali
-[pre-sort] IBase$Proxy.smali
[pre-sort] DebugInfo$Architecture.smali
+[pre-sort] IBase$Proxy.smali
+[pre-sort] IBase$Stub.smali
[pre-sort] DebugInfo.smali
[pre-sort] IBase.smali
[post-sort] DebugInfo$Architecture.smali
@@ -22,8 +22,8 @@
[pre-sort] PowerOffAlarmDialog$2.smali
[pre-sort] PowerOffAlarmDialog$ShutDownReceiver.smali
[pre-sort] PowerOffAlarmDialog.smali
-[pre-sort] PowerOffAlarmUtils.smali
[pre-sort] PowerOffAlarmPersistData.smali
+[pre-sort] PowerOffAlarmUtils.smali
[pre-sort] R$drawable.smali
[pre-sort] R$id.smali
[pre-sort] R$layout.smali |
iBotPeaches
approved these changes
Aug 7, 2024
|
hmm, I noticed that this only appears to happen when I do it inside tmpfs. If I repeat the same steps inside my $HOME, the sha1sums are always identical. |
|
Well thats odd. I sure don't have enough knowledge on filesystems to even begin to understand why that is. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This lets us assemble classes.dex in a reproducible manner.
Test:
apktool d test.apk > /dev/null
apktool b test > /dev/null
sha1sum test/build/apk/classes.dex
apktool -f d test.apk > /dev/null
apktool b test > /dev/null
sha1sum test/build/apk/classes.dex