diff --git a/frameworks/font/ui_font_vector.cpp b/frameworks/font/ui_font_vector.cpp
index 0832faae2d36532b2c5539eebeea1f43b4500057..418f4f85e7595ffd97b444adb5bd19feb9612a79 100644
--- a/frameworks/font/ui_font_vector.cpp
+++ b/frameworks/font/ui_font_vector.cpp
@@ -780,7 +780,7 @@ int8_t UIFontVector::LoadGlyphIntoFace(uint16_t& fontId, uint8_t fontSize, uint3
 {
     int32_t error;
     if (IsGlyphFont(unicode) != 0) {
-        if (fontId > FONT_ID_MAX || fontId != GetFontId(unicode)) {
+        if (fontId >= FONT_ID_MAX || fontId != GetFontId(unicode)) {
             return INVALID_RET_VALUE;
         }
         error = FT_Load_Glyph(ftFaces_[fontId], unicode & (0xFFFFFF), FT_LOAD_RENDER);
diff --git a/test/uitest/test_dialog/ui_test_dialog.h b/test/uitest/test_dialog/ui_test_dialog.h
index 44506710c310cc4489c6b061378df14f290ef496..fb0474e58c99027877820070d537a6c5e98ffb70 100644
--- a/test/uitest/test_dialog/ui_test_dialog.h
+++ b/test/uitest/test_dialog/ui_test_dialog.h
@@ -20,7 +20,7 @@
 #include "graphic_config.h"
 #include "ui_test.h"
 
-#if ENABLE_WINDOW
+#if defined(ENABLE_WINDOW) && ENABLE_WINDOW
 namespace OHOS {
 class TestUIDialogButtonListener;
 class TestUIDialogOnCancelListener;
diff --git a/test/uitest/test_vector_font/ui_test_vector_font.h b/test/uitest/test_vector_font/ui_test_vector_font.h
index 2a0e29831b5490837c616b568303050387d3b6d4..679a0b65ef1ed2e455b6c93e33fc1bdf14611b78 100644
--- a/test/uitest/test_vector_font/ui_test_vector_font.h
+++ b/test/uitest/test_vector_font/ui_test_vector_font.h
@@ -17,7 +17,7 @@
 #define UI_TEST_VECTOR_FONT_H
 
 #include "graphic_config.h"
-#if ENABLE_VECTOR_FONT
+#if defined(ENABLE_VECTOR_FONT) && ENABLE_VECTOR_FONT
 #include "ui_test.h"
 #include "components/ui_scroll_view.h"
 #include "font/ui_font.h"