bugfix: codecc check

Tencent · Jan 8, 2019 · 6f5ad08 · 6f5ad08
1 parent d6e7ed2
commit 6f5ad08
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/matrix/matrix-android/matrix-android-commons/src/main/cpp/elf_hook/elf_hook.c b/matrix/matrix-android/matrix-android-commons/src/main/cpp/elf_hook/elf_hook.c
@@ -262,6 +262,8 @@ static int compileAbiToElfMachine() {
     return EM_MIPS;
 #elif defined(__x86_64__)
     return EM_X86_64;
+#else //TODO add more abi here
+    return EM_NONE
 #endif
 }
 

diff --git a/...rix-android/matrix-gradle-plugin/src/main/java/com/tencent/matrix/trace/MethodTracer.java b/...rix-android/matrix-gradle-plugin/src/main/java/com/tencent/matrix/trace/MethodTracer.java
@@ -31,7 +31,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;

diff --git a/matrix/matrix-android/matrix-io-canary/src/main/cpp/core/io_canary.cc b/matrix/matrix-android/matrix-io-canary/src/main/cpp/core/io_canary.cc
@@ -33,6 +33,7 @@ namespace iocanary {
     }
 
     IOCanary::IOCanary() {
+        exit_ = false;
         std::thread detect_thread(&IOCanary::Detect, this);
         detect_thread.detach();
     }

diff --git a/matrix/matrix-android/matrix-io-canary/src/main/cpp/io_canary_jni.cc b/matrix/matrix-android/matrix-io-canary/src/main/cpp/io_canary_jni.cc
@@ -102,7 +102,7 @@ namespace iocanary {
             }
 
             JNIEnv* env;
-            bool attached;
+            bool attached = false;
             jint j_ret = kJvm->GetEnv((void**)&env, JNI_VERSION_1_6);
             if (j_ret == JNI_EDETACHED) {
                 jint jAttachRet = kJvm->AttachCurrentThread(&env, nullptr);
@@ -278,12 +278,12 @@ namespace iocanary {
 
         JNIEXPORT void JNICALL
         Java_com_tencent_matrix_iocanary_core_IOCanaryJniBridge_enableDetector(JNIEnv *env, jclass type, jint detector_type) {
-            iocanary::IOCanary::Get().RegisterDetector(DetectorType(detector_type));
+            iocanary::IOCanary::Get().RegisterDetector(static_cast<DetectorType>(detector_type));
         }
 
         JNIEXPORT void JNICALL
         Java_com_tencent_matrix_iocanary_core_IOCanaryJniBridge_setConfig(JNIEnv *env, jclass type, jint key, jlong val) {
-            iocanary::IOCanary::Get().SetConfig(IOCanaryConfigKey(key), val);
+            iocanary::IOCanary::Get().SetConfig(static_cast<IOCanaryConfigKey>(key), val);
         }
 
         JNIEXPORT jboolean JNICALL

diff --git a/.../matrix-sqlite-lint-android-sdk/src/full/java/com/tencent/sqlitelint/SQLiteLintIssue.java b/.../matrix-sqlite-lint-android-sdk/src/full/java/com/tencent/sqlitelint/SQLiteLintIssue.java
@@ -111,7 +111,7 @@ public boolean equals(Object o) {
         }
 
         SQLiteLintIssue d = (SQLiteLintIssue) o;
-        return d.id.equals(((SQLiteLintIssue) o).id);
+        return d.id.equals(id);
     }
 
     @Override

diff --git a/...d/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/EvilMethodTracer.java b/...d/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/EvilMethodTracer.java
@@ -538,15 +538,16 @@ private void makeKey(TreeNode node, AnalyseExtraInfo analyseExtraInfo) {
     private void getKey(TreeNode root, StringBuilder builder) {
         if (mAnalyseStackList.isEmpty()) {
             Iterator<TreeNode> iterator = root.mChildNodes.iterator();
+            int count = 0;
             while (iterator.hasNext()) {
+                if (count > Constants.MAX_LIMIT_ANALYSE_STACK_KEY_NUM) {
+                    break;
+                }
                 mAnalyseStackList.add(iterator.next().mItem);
+                count++;
             }
         }
 
-        if (mAnalyseStackList.size() > Constants.MAX_LIMIT_ANALYSE_STACK_KEY_NUM) {
-            mAnalyseStackList.subList(0, Constants.MAX_LIMIT_ANALYSE_STACK_KEY_NUM);
-        }
-
         for (MethodItem methodItem : mAnalyseStackList) {
             builder.append(methodItem.methodId);
             builder.append('\n');