add null check for MatUtils (#466)

Tencent · Oct 15, 2020 · e365d0e · e365d0e
1 parent f8d927a
commit e365d0e
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/source/tnn/utils/mat_utils.cc b/source/tnn/utils/mat_utils.cc
@@ -36,6 +36,9 @@ Status MatUtils::Copy(Mat& src, Mat& dst, void* command_queue) {
             return Status(TNNERR_PARAM_ERR, "src and dst DeviceType need be equal or one is device cpu");
         }
         auto converter = MatConverterManager::Shared()->CreateMatConverterAcc(device_type);
+        if (!converter) {
+            return Status(TNNERR_INIT_LAYER, "image converter is nil, check device type");
+        }
         return converter->Copy(src, dst, command_queue);
     }else {
         return Status(TNNERR_PARAM_ERR, "src and dst dims or MatType not equal"); 
@@ -56,6 +59,9 @@ Status MatUtils::Resize(Mat& src, Mat& dst, ResizeParam param, void* command_que
         return Status(TNNERR_PARAM_ERR, "DeviceType or MatType not equal");
     }
     auto converter = MatConverterManager::Shared()->CreateMatConverterAcc(src.GetDeviceType());
+    if (!converter) {
+        return Status(TNNERR_INIT_LAYER, "image converter is nil, check device type");
+    }
     return converter->Resize(src, dst, param, command_queue);
 }
 
@@ -70,6 +76,9 @@ Status MatUtils::Crop(Mat& src, Mat& dst, CropParam param, void* command_queue)
         return Status(TNNERR_PARAM_ERR, "DeviceType or MatType not equal");
     }
     auto converter = MatConverterManager::Shared()->CreateMatConverterAcc(src.GetDeviceType());
+    if (!converter) {
+        return Status(TNNERR_INIT_LAYER, "image converter is nil, check device type");
+    }
     return converter->Crop(src, dst, param, command_queue);
 }
 
@@ -78,6 +87,9 @@ Status MatUtils::WarpAffine(Mat& src, Mat& dst, WarpAffineParam param, void* com
         return Status(TNNERR_PARAM_ERR, "DeviceType or MatType not equal");
     }
     auto converter = MatConverterManager::Shared()->CreateMatConverterAcc(src.GetDeviceType());
+    if (!converter) {
+        return Status(TNNERR_INIT_LAYER, "image converter is nil, check device type");
+    }
     return converter->WarpAffine(src, dst, param, command_queue);
 }
 
@@ -86,6 +98,9 @@ Status MatUtils::CvtColor(Mat& src, Mat& dst, ColorConversionType type, void* co
         return Status(TNNERR_PARAM_ERR, "DeviceType or MatType not equal");
     }
     auto converter = MatConverterManager::Shared()->CreateMatConverterAcc(src.GetDeviceType());
+    if (!converter) {
+        return Status(TNNERR_INIT_LAYER, "image converter is nil, check device type");
+    }
     return converter->CvtColor(src, dst, type, command_queue);
 }