c_str() の結果を明示的にアロケーションしないと Unity Editor がクラッシュする

shiguredo · Feb 8, 2024 · 4844029 · 4844029
1 parent 75665ae
commit 4844029
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/unity.cpp b/src/unity.cpp
@@ -313,8 +313,9 @@ void sora_audio_output_helper_set_handsfree(void* p, unity_bool_t enabled) {
 UNITY_INTERFACE_EXPORT const char* get_track_id(ptrid_t track_id,
                                                 unity_bool_t* found) {
   void* p = sora_unity_sdk::IdPointer::Instance().Lookup(track_id);
-
   *found = p != nullptr ? 1 : 0;
+
+  // return *found ? ((sora_unity_sdk::UnityRenderer::Sink*)p)->GetTrackId().c_str()
   return *found ? ((sora_unity_sdk::UnityRenderer::Sink*)p)->GetTrackIdC()
                 : nullptr;
 }

diff --git a/src/unity_renderer.cpp b/src/unity_renderer.cpp
@@ -10,15 +10,14 @@ namespace sora_unity_sdk {
 
 // UnityRenderer::Sink
 
-UnityRenderer::Sink::Sink(webrtc::VideoTrackInterface* track) : track_(track) {
+UnityRenderer::Sink::Sink(webrtc::VideoTrackInterface* track)
+    : track_(track), track_id_(track_->id()) {
   RTC_LOG(LS_INFO) << "[" << (void*)this << "] Sink::Sink";
   deleting_ = false;
   updating_ = false;
   ptrid_ = IdPointer::Instance().Register(this);
   track_->AddOrUpdateSink(this, rtc::VideoSinkWants());
-  track_id_ = track->id();
 
-  // track_id_c_ = track_id_.c_str();
   size_t size = strlen(track_id_.c_str());
   track_id_c_ = new char[size + 1];
   strcpy(track_id_c_, track_id_.c_str());
@@ -33,15 +32,13 @@ UnityRenderer::Sink::~Sink() {
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
   }
 
-  // track_id_c_ を開放すると Unity Editor がクラッシュする
-  // delete[] track_id_c_;
   track_->RemoveSink(this);
   IdPointer::Instance().Unregister(ptrid_);
 }
 ptrid_t UnityRenderer::Sink::GetSinkID() const {
   return ptrid_;
 }
-std::string UnityRenderer::Sink::GetTrackId() const {
+const std::string& UnityRenderer::Sink::GetTrackId() const {
   return track_id_;
 }
 char* UnityRenderer::Sink::GetTrackIdC() const {

diff --git a/src/unity_renderer.h b/src/unity_renderer.h
@@ -31,7 +31,7 @@ class UnityRenderer {
     Sink(webrtc::VideoTrackInterface* track);
     ~Sink();
     ptrid_t GetSinkID() const;
-    std::string GetTrackId() const;
+    const std::string& GetTrackId() const;
     char* GetTrackIdC() const;
     void SetTrack(webrtc::VideoTrackInterface* track);