From 6e4b5bcd72d99ccb90f0ce945a8cd5368490d1e4 Mon Sep 17 00:00:00 2001
From: tj0 <tj0@oceanbase.com>
Date: Tue, 14 Sep 2021 20:11:25 +0800
Subject: [PATCH] fix WhiteScan CHECKED_RETURN

---
 src/share/object/ob_obj_cast.cpp     | 6 ++++--
 src/sql/engine/expr/ob_expr_cast.cpp | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/share/object/ob_obj_cast.cpp b/src/share/object/ob_obj_cast.cpp
index 74c36dfd33..257e32da5e 100644
--- a/src/share/object/ob_obj_cast.cpp
+++ b/src/share/object/ob_obj_cast.cpp
@@ -8082,10 +8082,12 @@ int obj_collation_check(const bool is_strict_mode, const ObCollationType cs_type
     int64_t well_formed_len = 0;
     if (ob_is_lob_locator(obj.get_type())) {
       if (OB_FAIL(obj.get_string(str))) {
-        STORAGE_LOG(WARN, "Failed to get payload from lob locator", K(ret), K(obj));
+        LOG_WARN("Failed to get payload from lob locator", K(ret), K(obj));
       }
     } else {
-      obj.get_string(str);
+      if (OB_FAIL(obj.get_string(str))) {
+        LOG_WARN("Failed to get payload from string", K(ret), K(obj));
+      }
     }
     if (OB_FAIL(ret)) {
 
diff --git a/src/sql/engine/expr/ob_expr_cast.cpp b/src/sql/engine/expr/ob_expr_cast.cpp
index 4a6ca660a4..6f95fb547c 100644
--- a/src/sql/engine/expr/ob_expr_cast.cpp
+++ b/src/sql/engine/expr/ob_expr_cast.cpp
@@ -573,7 +573,9 @@ int ObExprCast::calc_result2(ObObj& result, const ObObj& obj1, const ObObj& obj2
           } else {
             buf_obj1 = *to_type_obj;
             buf_obj1.set_collation(result_type_);
-            buf_obj1.get_string(text);
+            if (OB_FAIL(buf_obj1.get_string(text))) {
+              LOG_WARN("Failed to get buf_obj1 string", K(ret));
+            }
           }
 
           if (OB_FAIL(ret)) {
-- 
GitLab