From 3a4c1375db7001d4126e41dd8008bf99edc8573e Mon Sep 17 00:00:00 2001
From: fwx1262723 <fangjiawei8@huawei.com>
Date: Wed, 22 May 2024 16:02:46 +0800
Subject: [PATCH] cleancode for jit

Signed-off-by: fwx1262723 <fangjiawei8@huawei.com>
---
 .../innerkits/jit_code_sign/include/jit_code_signer_base.h  | 4 ++--
 .../innerkits/jit_code_sign/src/jit_code_signer_base.cpp    | 6 +++---
 .../innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp  | 2 +-
 .../innerkits/jit_code_sign/src/jit_code_signer_single.cpp  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h b/interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h
index 868034b..bba02bc 100644
--- a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h
+++ b/interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h
@@ -31,12 +31,12 @@ constexpr int32_t LOG_2_INSTRUCTION_SIZE = 2;
 
 static inline int GetIndexFromOffset(int offset)
 {
-    return offset >> LOG_2_INSTRUCTION_SIZE;
+    return static_cast<int>(static_cast<uint32_t>(offset) >> LOG_2_INSTRUCTION_SIZE);
 }
 
 class JitCodeSignerBase {
 public:
-    JitCodeSignerBase() {};
+    JitCodeSignerBase() : tmpBuffer_(nullptr), offset_(0) {};
     virtual ~JitCodeSignerBase() {}
     virtual void Reset() = 0;
     virtual void SignInstruction(Instr insn) = 0;
diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp b/interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp
index 9856e9b..10002a9 100644
--- a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp
+++ b/interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp
@@ -49,7 +49,7 @@ int32_t JitCodeSignerBase::SignData(const Byte *const data, uint32_t size)
         return CS_ERR_INVALID_DATA;
     }
     uint32_t cur = 0;
-    int unsignedSize = willSign_.size();
+    size_t unsignedSize = willSign_.size();
     if ((unsignedSize == 0) && (size >= INSTRUCTION_SIZE)) {
         auto insnPtr = reinterpret_cast<const Instr *const>(data);
         while (cur + INSTRUCTION_SIZE <= size) {
@@ -114,7 +114,7 @@ int32_t JitCodeSignerBase::PatchData(Byte *buffer, const Byte *const data, uint3
 
 bool JitCodeSignerBase::ConvertPatchOffsetToIndex(const int offset, int &curIndex)
 {
-    if ((offset < 0) || ((offset & UNALIGNMENT_MASK) != 0)) {
+    if ((offset < 0) || ((static_cast<uint32_t>(offset) & UNALIGNMENT_MASK) != 0)) {
         return false;
     }
     curIndex = GetIndexFromOffset(offset);
@@ -138,7 +138,7 @@ int32_t JitCodeSignerBase::CheckDataCopy(Instr *jitMemory, Byte *tmpBuffer, int
     // update tmp buffer
     tmpBuffer_ = tmpBuffer;
 
-    if (((size & UNALIGNMENT_MASK) != 0) ||
+    if (((static_cast<uint32_t>(size) & UNALIGNMENT_MASK) != 0) ||
         (static_cast<uint32_t>(size) > signTable_.size() * INSTRUCTION_SIZE)) {
 #ifdef JIT_FORT_DISABLE
         LOG_ERROR("Range invalid, size = %{public}d, table size = %{public}zu",
diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp b/interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp
index ec08c3c..1bd3330 100644
--- a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp
+++ b/interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp
@@ -87,7 +87,7 @@ int32_t JitCodeSignerHybrid::PatchInstruction(int offset, Instr insn)
         LOG_ERROR("Offset invalid");
         return CS_ERR_PATCH_INVALID;
     }
-    int signature = ctx_.SignSingle(insn, curIndex);
+    uint32_t signature = ctx_.SignSingle(insn, curIndex);
     signTable_[curIndex] = signature;
     return CS_SUCCESS;
 }
diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp b/interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp
index ba86c1f..128548a 100644
--- a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp
+++ b/interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp
@@ -63,7 +63,7 @@ int32_t JitCodeSignerSingle::PatchInstruction(int offset, Instr insn)
         LOG_ERROR("Offset invalid");
         return CS_ERR_PATCH_INVALID;
     }
-    int signature = ctx_.SignSingle(insn, curIndex);
+    uint32_t signature = ctx_.SignSingle(insn, curIndex);
     signTable_[curIndex] = signature;
     return CS_SUCCESS;
 }
-- 
Gitee