From e90b501b319e1e4dbb3966b540851d913126f176 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 26 Apr 2019 18:25:05 +0200 Subject: [PATCH] GraphicsBitmap: munmap() pixels on destruction of self-allocating bitmaps. --- SharedGraphics/GraphicsBitmap.cpp | 6 ++++++ SharedGraphics/GraphicsBitmap.h | 1 + 2 files changed, 7 insertions(+) diff --git a/SharedGraphics/GraphicsBitmap.cpp b/SharedGraphics/GraphicsBitmap.cpp index 6e8c3e5a11..16831acc84 100644 --- a/SharedGraphics/GraphicsBitmap.cpp +++ b/SharedGraphics/GraphicsBitmap.cpp @@ -21,6 +21,7 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size) m_data = (RGBA32*)mmap(nullptr, size_in_bytes, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); ASSERT(m_data && m_data != (void*)-1); set_mmap_name(m_data, size_in_bytes, String::format("GraphicsBitmap [%dx%d]", width(), height()).characters()); + m_needs_munmap = true; } Retained GraphicsBitmap::create_wrapper(Format format, const Size& size, RGBA32* data) @@ -74,6 +75,11 @@ GraphicsBitmap::GraphicsBitmap(Format format, Retained&& shared_bu GraphicsBitmap::~GraphicsBitmap() { + if (m_needs_munmap) { + size_t size_in_bytes = m_size.area() * sizeof(RGBA32); + int rc = munmap(m_data, size_in_bytes); + ASSERT(rc == 0); + } m_data = nullptr; } diff --git a/SharedGraphics/GraphicsBitmap.h b/SharedGraphics/GraphicsBitmap.h index 4900e7a60c..75b55a0b82 100644 --- a/SharedGraphics/GraphicsBitmap.h +++ b/SharedGraphics/GraphicsBitmap.h @@ -43,6 +43,7 @@ private: RGBA32* m_data { nullptr }; size_t m_pitch { 0 }; Format m_format { Format::Invalid }; + bool m_needs_munmap { false }; MappedFile m_mapped_file; RetainPtr m_shared_buffer; };