changeset 122:45722358d459 fix-leak

added PythonBytes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 30 Aug 2023 08:14:02 +0200
parents 6ad5da29f260
children 5f0b7795afaf
files Sources/PythonBytes.cpp Sources/PythonBytes.h
diffstat 2 files changed, 100 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Sources/PythonBytes.cpp	Wed Aug 30 08:14:02 2023 +0200
@@ -0,0 +1,51 @@
+/**
+ * Python plugin for Orthanc
+ * Copyright (C) 2020-2022 Osimis S.A., Belgium
+ * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "PythonBytes.h"
+
+#include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
+
+
+void PythonBytes::SanityCheck()
+{
+  if (!bytes_->IsValid())
+  {
+    OrthancPlugins::LogError("Cannot create Python bytes");
+    ORTHANC_PLUGINS_THROW_EXCEPTION(InternalError);
+  }
+}
+
+
+PythonBytes::PythonBytes(PythonLock& lock,
+                         const void* data,
+                         size_t size)
+{
+  if (data == NULL &&
+      size != 0)
+  {
+    ORTHANC_PLUGINS_THROW_EXCEPTION(NullPointer);
+  }
+  else
+  {
+    PyObject* obj = PyBytes_FromStringAndSize(reinterpret_cast<const char*>(data), size);
+    bytes_.reset(new PythonObject(lock, obj));
+    SanityCheck();
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Sources/PythonBytes.h	Wed Aug 30 08:14:02 2023 +0200
@@ -0,0 +1,49 @@
+/**
+ * Python plugin for Orthanc
+ * Copyright (C) 2020-2022 Osimis S.A., Belgium
+ * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "PythonObject.h"
+
+#include <Compatibility.h>  // For std::unique_ptr
+
+// A Python string is always valid, or an exception was thrown on its creation
+class PythonBytes : public boost::noncopyable
+{
+private:
+  std::unique_ptr<PythonObject>  bytes_;
+
+  void SanityCheck();
+
+public:
+  PythonBytes(PythonLock& lock,
+              const void* data,
+              size_t size);
+
+  PyObject* GetPyObject() const
+  {
+    return bytes_->GetPyObject();
+  }
+
+  PyObject* Release()
+  {
+    return bytes_->Release();
+  }
+};