ReVanced/aapt2
1
0
Fork 0
mirror of https://github.com/revanced/aapt2.git synced 2025-04-30 05:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Add basic_string inline templates to fix args segmentation fault

Browse Source
This commit is contained in:
ponces 2022-09-24 02:31:07 +01:00 committed by Alberto Ponces
parent a2d190f1cf
commit 1ad472f500
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
patches/aapt2.patch
View File

@ -12,6 +12,49 @@ index cae2d0bc16b3..13c5f8fc84e8 100644
#include <binder/TextOutput.h> #include <binder/TextOutput.h>
#endif #endif
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
+++ b/src/base/libs/androidfw/include/androidfw/StringPiece.h
@@ -75,6 +75,11 @@ class BasicStringPiece {
bool operator>(const BasicStringPiece<TChar>& rhs) const;
bool operator==(const BasicStringPiece<TChar>& rhs) const;
bool operator!=(const BasicStringPiece<TChar>& rhs) const;
+ // for std::basic_string
+ bool operator<(const std::basic_string<TChar>& rhs) const;
+ bool operator>(const std::basic_string<TChar>& rhs) const;
+ bool operator==(const std::basic_string<TChar>& rhs) const;
+ bool operator!=(const std::basic_string<TChar>& rhs) const;
const_iterator begin() const;
const_iterator end() const;
@@ -256,6 +261,26 @@ inline bool BasicStringPiece<TChar>::operator!=(const BasicStringPiece<TChar>& r
return compare(rhs) != 0;
}
+template <typename TChar>
+inline bool BasicStringPiece<TChar>::operator<(const std::basic_string<TChar>& rhs) const {
+ return compare(BasicStringPiece(rhs)) < 0;
+}
+
+template <typename TChar>
+inline bool BasicStringPiece<TChar>::operator>(const std::basic_string<TChar>& rhs) const {
+ return compare(BasicStringPiece(rhs)) > 0;
+}
+
+template <typename TChar>
+inline bool BasicStringPiece<TChar>::operator==(const std::basic_string<TChar>& rhs) const {
+ return compare(BasicStringPiece(rhs)) == 0;
+}
+
+template <typename TChar>
+inline bool BasicStringPiece<TChar>::operator!=(const std::basic_string<TChar>& rhs) const{
+ return compare(BasicStringPiece(rhs)) != 0;
+}
+
template <typename TChar>
inline typename BasicStringPiece<TChar>::const_iterator BasicStringPiece<TChar>::begin() const {
return data_;
diff --git a/src/base/tools/aapt2/ResourceTable.cpp b/src/base/tools/aapt2/ResourceTable.cpp diff --git a/src/base/tools/aapt2/ResourceTable.cpp b/src/base/tools/aapt2/ResourceTable.cpp
index 8ab1493c6ab3..3a855f0f6866 100644 index 8ab1493c6ab3..3a855f0f6866 100644
--- a/src/base/tools/aapt2/ResourceTable.cpp --- a/src/base/tools/aapt2/ResourceTable.cpp