[Xposed] No longer change the object size of TypedArray

The XTypedArray class has no more additional fields on Java side now, so this hack is obsolete. Instead, verify that this claim is actually correct.
jackyglony · Oct 15, 2017 · b00d990 · b00d990
1 parent f2a7379
commit b00d990
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 29 deletions.
diff --git a/libxposed_art.cpp b/libxposed_art.cpp
@@ -64,16 +64,6 @@ void logExceptionStackTrace() {
 #endif
 }
 
-/** Lay the foundations for XposedBridge.setObjectClassNative() */
-void prepareSubclassReplacement(JNIEnv* env, jclass clazz) {
-    // clazz is supposed to replace its superclass, so make sure enough memory is allocated
-    ScopedObjectAccess soa(env);
-    mirror::Class* sub = soa.Decode<mirror::Class*>(clazz);
-    mirror::Class* super = sub->GetSuperClass();
-    super->SetObjectSize(sub->GetObjectSize());
-}
-
-
 ////////////////////////////////////////////////////////////
 // JNI methods
 ////////////////////////////////////////////////////////////
@@ -128,6 +118,18 @@ void XposedBridge_setObjectClassNative(JNIEnv* env, jclass, jobject javaObj, jcl
         return;
     }
     mirror::Object* obj = soa.Decode<mirror::Object*>(javaObj);
+    mirror::Class* currentClass = obj->GetClass();
+    if (clazz->GetObjectSize() != currentClass->GetObjectSize()) {
+        std::string msg = StringPrintf("Different object sizes: %s (%d) vs. %s (%d)",
+                PrettyClass(clazz).c_str(), clazz->GetObjectSize(),
+                PrettyClass(currentClass).c_str(), currentClass->GetObjectSize());
+#if PLATFORM_SDK_VERSION >= 23
+        ThrowIllegalArgumentException(msg.c_str());
+#else
+        ThrowIllegalArgumentException(nullptr, msg.c_str());
+#endif
+        return;
+    }
     obj->SetClass(clazz);
 }
 

diff --git a/libxposed_common.cpp b/libxposed_common.cpp
@@ -134,15 +134,6 @@ void onVmCreatedCommon(JNIEnv* env) {
         return;
     }
 
-    jclass classXTypedArray = env->FindClass(CLASS_XTYPED_ARRAY);
-    if (classXTypedArray == NULL) {
-        ALOGE("Error while loading XTypedArray class '%s':", CLASS_XTYPED_ARRAY);
-        logExceptionStackTrace();
-        env->ExceptionClear();
-        return;
-    }
-    prepareSubclassReplacement(env, classXTypedArray);
-
     if (!onVmCreated(env)) {
         return;
     }

diff --git a/libxposed_common.h b/libxposed_common.h
@@ -14,7 +14,6 @@ namespace xposed {
 #define CLASS_XPOSED_BRIDGE  "de/robv/android/xposed/XposedBridge"
 #define CLASS_XRESOURCES     "android/content/res/XResources"
 #define CLASS_MIUI_RESOURCES "android/content/res/MiuiResources"
-#define CLASS_XTYPED_ARRAY   "android/content/res/XResources$XTypedArray"
 #define CLASS_ZYGOTE_SERVICE "de/robv/android/xposed/services/ZygoteService"
 #define CLASS_FILE_RESULT    "de/robv/android/xposed/services/FileResult"
 

diff --git a/libxposed_dalvik.cpp b/libxposed_dalvik.cpp
@@ -16,7 +16,6 @@ namespace xposed {
 ////////////////////////////////////////////////////////////
 
 bool initMemberOffsets(JNIEnv* env);
-void prepareSubclassReplacement(jclass clazz);
 void hookedMethodCallback(const u4* args, JValue* pResult, const Method* method, ::Thread* self);
 void XposedBridge_invokeOriginalMethodNative(const u4* args, JValue* pResult, const Method* method, ::Thread* self);
 
@@ -129,14 +128,6 @@ inline void setObjectArrayElement(const ArrayObject* obj, int index, Object* val
     dvmWriteBarrierArray(obj, index, index + 1);
 }
 
-/** Lay the foundations for XposedBridge.setObjectClassNative() */
-void prepareSubclassReplacement(JNIEnv*, jclass clazz) {
-    // clazz is supposed to replace its superclass, so make sure enough memory is allocated
-    ClassObject* sub = (ClassObject*) dvmDecodeIndirectRef(dvmThreadSelf(), clazz);
-    ClassObject* super = sub->super;
-    super->objectSize = sub->objectSize;
-}
-
 /** Wrapper used by the common part of the library. */
 void logExceptionStackTrace() {
     dvmLogExceptionStackTrace();