changeset 6173:628edb487cec

fix dangerous cast in OrthancPlugins::MemoryBuffer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 11 Jun 2025 17:51:11 +0200 (6 days ago)
parents 6b55a6afae69
children 9fce9208f24f 705343f27dab
files OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Wed Jun 11 17:34:05 2025 +0200
+++ b/OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Wed Jun 11 17:51:11 2025 +0200
@@ -1566,7 +1566,7 @@
     {
       if (!answer.IsEmpty())
       {
-        result.assign(answer.GetData(), answer.GetSize());
+        result.assign(reinterpret_cast<const char*>(answer.GetData()), answer.GetSize());
       }
       return true;
     }
--- a/OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h	Wed Jun 11 17:34:05 2025 +0200
+++ b/OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h	Wed Jun 11 17:51:11 2025 +0200
@@ -227,11 +227,11 @@
 
     OrthancPluginMemoryBuffer Release();
 
-    const char* GetData() const
+    const void* GetData() const
     {
       if (buffer_.size > 0)
       {
-        return reinterpret_cast<const char*>(buffer_.data);
+        return buffer_.data;
       }
       else
       {
--- a/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp	Wed Jun 11 17:34:05 2025 +0200
+++ b/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp	Wed Jun 11 17:51:11 2025 +0200
@@ -221,7 +221,7 @@
       OrthancPluginSetHttpHeader(OrthancPlugins::GetGlobalContext(),
                                  output, "Last-Modified", t.c_str());
 
-      Answer(output, content.GetData(), content.GetSize(), mime);
+      Answer(output, reinterpret_cast<const char*>(content.GetData()), content.GetSize(), mime);
     }
   }
 }