Fix getcallinguid crash on Q

梁丽欣 · web-flow · commit 6294a23450ca · 2020-03-03T14:55:47.000+08:00
diff --git a/VirtualApp/lib/src/main/jni/Foundation/VMPatch.cpp b/VirtualApp/lib/src/main/jni/Foundation/VMPatch.cpp
@@ -427,7 +427,10 @@ void hookAndroidVM(JArrayClass<jobject> javaMethods,
         }
     }
     measureNativeOffset(isArt);
-    replaceGetCallingUid(isArt);
+    // Crash on Q if hook directly by modify entrypoint of function.
+    // Just skip this step on Q and get never crash
+    if(apiLevel<=28)
+        replaceGetCallingUid(isArt);
     replaceOpenDexFileMethod(javaMethods.getElement(OPEN_DEX).get(), isArt,
                              apiLevel);
     replaceCameraNativeSetupMethod(javaMethods.getElement(CAMERA_SETUP).get(),
@@ -492,4 +495,4 @@ void *getDvmOrArtSOHandle() {
         soInfo = RTLD_DEFAULT;
     }
     return soInfo;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,10 @@ void hookAndroidVM(JArrayClass<jobject> javaMethods,`
`427`	`427`	`}`
`428`	`428`	`}`
`429`	`429`	`measureNativeOffset(isArt);`
`430`		`- replaceGetCallingUid(isArt);`
	`430`	`+ // Crash on Q if hook directly by modify entrypoint of function.`
	`431`	`+ // Just skip this step on Q and get never crash`
	`432`	`+ if(apiLevel<=28)`
	`433`	`+ replaceGetCallingUid(isArt);`
`431`	`434`	`replaceOpenDexFileMethod(javaMethods.getElement(OPEN_DEX).get(), isArt,`
`432`	`435`	`apiLevel);`
`433`	`436`	`replaceCameraNativeSetupMethod(javaMethods.getElement(CAMERA_SETUP).get(),`
`@@ -492,4 +495,4 @@ void *getDvmOrArtSOHandle() {`
`492`	`495`	`soInfo = RTLD_DEFAULT;`
`493`	`496`	`}`
`494`	`497`	`return soInfo;`
`495`		`-}`
	`498`	`+}`