ReVanced-Mirror/aapt2
1
0
Fork 0
mirror of https://github.com/revanced/aapt2.git synced 2024-07-22 14:53:25 +02:00
Code Issues Projects Releases Wiki Activity

fix: Specify minimum alignment for ResStringPool_span to fix SIGBUS on ARMv7

Browse Source 
Apparently, a SIGSEGV is also fixed by that.
This commit is contained in:
oSumAtrIX 2024-07-17 18:29:18 +02:00
parent fa1b651994
commit 8285e73cd7
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/androidfw.patch
View File

@ -12,6 +12,19 @@ index cae2d0bc16b3..13c5f8fc84e8 100644
#include <binder/TextOutput.h>
#endif
diff --git a/src/base/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h
index 3d66244646d5..2d27c34a9154 100644
--- a/src/base/libs/androidfw/include/androidfw/ResourceTypes.h
+++ b/src/base/libs/androidfw/include/androidfw/ResourceTypes.h
@@ -500,7 +500,7 @@ struct ResStringPool_span
// The range of characters in the string that this span applies to.
uint32_t firstChar, lastChar;
-};
+} __attribute__((__packed__, aligned(1)));
/**
* Convenience class for accessing data in a ResStringPool resource.
diff --git a/src/base/libs/androidfw/include/androidfw/StringPiece.h b/src/base/libs/androidfw/include/androidfw/StringPiece.h
index 921877dc4982..27e27e1c2b94 100644
--- a/src/base/libs/androidfw/include/androidfw/StringPiece.h