[clang-tidy] No.48 enable clang-analyzer-unix.Malloc (#55658)

RedContritio · web-flow · commit a9c7ff2c383d · 2023-11-06T15:22:33.000+08:00
* enable clang-analyzer-unix.Malloc rule in clang-tidy

* fix 2 Malloc clang-tidy

* add comment
diff --git a/.clang-tidy b/.clang-tidy
@@ -140,7 +140,7 @@ clang-analyzer-optin.portability.UnixAPI,
 clang-analyzer-security.insecureAPI.vfork,
 -clang-analyzer-unix.API,
 -clang-analyzer-unix.DynamicMemoryModeling,
--clang-analyzer-unix.Malloc,
+clang-analyzer-unix.Malloc,
 -clang-analyzer-unix.MallocSizeof,
 -clang-analyzer-unix.MismatchedDeallocator,
 clang-analyzer-unix.Vfork,
diff --git a/paddle/fluid/operators/detection/mask_util.cc b/paddle/fluid/operators/detection/mask_util.cc
@@ -194,13 +194,24 @@ void Polys2MaskWrtBox(const std::vector<std::vector<float>>& polygons,
   w = std::max(w, static_cast<float>(1.));
   h = std::max(h, static_cast<float>(1.));
 
-  uint8_t* msk = nullptr;
+  // short-circuit for case "polygons.size() == 1"
   if (polygons.size() == 1UL) {
-    msk = mask;
-  } else {
-    msk = reinterpret_cast<uint8_t*>(
-        malloc(M * M * polygons.size() * sizeof(uint8_t)));  // NOLINT
+    int k = static_cast<int>(polygons[0].size() / 2);
+    std::vector<float> p;
+    for (int j = 0; j < k; ++j) {
+      float pw = (polygons[0][2 * j] - box[0]) * M / w;      // NOLINT
+      float ph = (polygons[0][2 * j + 1] - box[1]) * M / h;  // NOLINT
+      p.push_back(pw);
+      p.push_back(ph);
+    }
+    Poly2Mask(p.data(), k, M, M, mask);
+
+    return;
   }
+
+  uint8_t* msk = reinterpret_cast<uint8_t*>(
+      malloc(M * M * polygons.size() * sizeof(uint8_t)));  // NOLINT
+
   for (size_t i = 0; i < polygons.size(); ++i) {
     int k = static_cast<int>(polygons[i].size() / 2);
     std::vector<float> p;
@@ -214,19 +225,17 @@ void Polys2MaskWrtBox(const std::vector<std::vector<float>>& polygons,
     Poly2Mask(p.data(), k, M, M, msk_i);
   }
 
-  if (polygons.size() > 1UL) {
-    for (size_t i = 0; i < polygons.size(); ++i) {
-      uint8_t* msk_i = msk + i * M * M;
-      for (int j = 0; j < M * M; ++j) {
-        if (i == 0) {
-          mask[j] = msk_i[j];
-        } else {
-          mask[j] = (mask[j] + msk_i[j]) > 0 ? 1 : 0;
-        }
+  for (size_t i = 0; i < polygons.size(); ++i) {
+    uint8_t* msk_i = msk + i * M * M;
+    for (int j = 0; j < M * M; ++j) {
+      if (i == 0) {
+        mask[j] = msk_i[j];
+      } else {
+        mask[j] = (mask[j] + msk_i[j]) > 0 ? 1 : 0;
       }
     }
-    free(msk);  // NOLINT
   }
+  free(msk);  // NOLINT
 }
 
 }  // namespace operators
