diff --git a/source/os/src/osTimer.c b/source/os/src/osTimer.c
index fe3a0dcf95..12a43925cd 100644
--- a/source/os/src/osTimer.c
+++ b/source/os/src/osTimer.c
@@ -87,6 +87,8 @@ static TdThread      timerThread;
 static timer_t       timerId;
 static volatile bool stopTimer = false;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
 static void *taosProcessAlarmSignal(void *tharg) {
   // Block the signal
   sigset_t sigset;
@@ -110,8 +112,8 @@ static void *taosProcessAlarmSignal(void *tharg) {
   sevent.sigev_signo = SIGALRM;
 
   if (timer_create(CLOCK_REALTIME, &sevent, &timerId) == -1) {
-     terrno = TAOS_SYSTEM_ERROR(errno);
-     return NULL;
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
   }
 
   taosThreadCleanupPush(taosDeleteTimer, &timerId);
@@ -128,7 +130,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
       break;
     }
 
-    int signo;
+    int     signo;
     int32_t code = 0;
     while (!stopTimer) {
       code = sigwait(&sigset, &signo);
@@ -145,6 +147,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
 
   return NULL;
 }
+#pragma GCC diagnostic pop
 #endif
 
 int taosInitTimer(void (*callback)(int), int ms) {
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 37da47bae6..ebec4ca06c 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -1267,6 +1267,9 @@ void *shellCancelHandler(void *arg) {
   return NULL;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+
 void *shellThreadLoop(void *arg) {
   setThreadName("shellThreadLoop");
   taosGetOldTerminalMode();
@@ -1298,6 +1301,7 @@ void *shellThreadLoop(void *arg) {
   taosThreadCleanupPop(1);
   return NULL;
 }
+#pragma GCC diagnostic pop
 
 int32_t shellExecute() {
   printf(shell.info.clientVersion, shell.info.cusName, taos_get_client_info(), shell.info.cusName);