Fix Svace issues

- UNREACHABLE_CODE.RET
- COMPARE_RESULT_OF_NEW

diff --git a/src/esplusplayer/src/esplayer.cpp b/src/esplusplayer/src/esplayer.cpp
index a022e131f3a01740bb8177bb8890cbf442d6be79..1ac07f6aed53c3dfa5387dfa3f6296adb1a55c32 100755 (executable)
--- a/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@ -1164,10 +1164,7 @@ bool EsPlayer::SetStream_(const Track& track) {
     }
   }
   auto op = [this, track]() noexcept {
-    if (!SetTrack_(track)) {
-      return false;
-    }
-    return true;
+    return SetTrack_(track);
   };
 
   CafLogger::LogMessage(CafEventType::kStreamReady, caf_unique_number);
@@ -2498,10 +2495,8 @@ void EsPlayer::TrackRendererEventListener::OnErrorMsg(
           int nLen = 19;
           strncat(json_string, std::to_string(track.width).c_str(), nLen);
           nLen = sizeof(json_string) - strlen(json_string) - 1;
-          if (nLen < 0) nLen = 0;
           strncat(json_string, "*", nLen);
           nLen = sizeof(json_string) - strlen(json_string) - 1;
-          if (nLen < 0) nLen = 0;
           strncat(json_string, std::to_string(track.height).c_str(), nLen);
           message["resolution"] = json_string;
           memset(json_string, 0, sizeof(json_string));
@@ -2509,10 +2504,8 @@ void EsPlayer::TrackRendererEventListener::OnErrorMsg(
           strncat(json_string, std::to_string(track.framerate_num).c_str(),
                   nLen);
           nLen = sizeof(json_string) - strlen(json_string) - 1;
-          if (nLen < 0) nLen = 0;
           strncat(json_string, "/", nLen);
           nLen = sizeof(json_string) - strlen(json_string) - 1;
-          if (nLen < 0) nLen = 0;
           strncat(json_string, std::to_string(track.framerate_den).c_str(),
                   nLen);
           message["fps"] = json_string;

diff --git a/ut/src/utils/utility.cpp b/ut/src/utils/utility.cpp
index 65ba9c37b67225e51888498982805f085b8134c9..0ee786f0dd042c84d0651c59781373f83a9697c0 100644 (file)
--- a/ut/src/utils/utility.cpp
+++ b/ut/src/utils/utility.cpp
@@ -201,10 +201,10 @@ void Utility::FeedingEsPacket(esplusplayer_handle player,
   };
   if (type == ESPLUSPLAYER_STREAM_TYPE_VIDEO) {
     reader =
-        new EsStreamReader(uri + "video_00/", ESPLUSPLAYER_STREAM_TYPE_VIDEO);
+        new (std::nothrow) EsStreamReader(uri + "video_00/", ESPLUSPLAYER_STREAM_TYPE_VIDEO);
   } else {
     reader =
-        new EsStreamReader(uri + "audio_00/", ESPLUSPLAYER_STREAM_TYPE_AUDIO);
+        new (std::nothrow) EsStreamReader(uri + "audio_00/", ESPLUSPLAYER_STREAM_TYPE_AUDIO);
   }
   auto feeding_task = std::thread(feeding_task_fn);
   if (feeding_task.joinable()) feeding_task.join();