summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2439ae8)
raw | patch | inline | side by side (parent: 2439ae8)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Fri, 24 Mar 2017 08:07:54 +0000 (10:07 +0200) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Fri, 24 Mar 2017 08:07:56 +0000 (10:07 +0200) |
Add sanity checks to reserve_* methods, and return null if the give
connector/crtc is null.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
connector/crtc is null.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
kms++util/src/resourcemanager.cpp | patch | blob | history |
index 23a1480de2903ac2a07dee4196e65d069079fdf4..f751147799ececcc50f6ee8bcdd587dab3143324 100644 (file)
Connector* ResourceManager::reserve_connector(Connector* conn)
{
+ if (!conn)
+ return nullptr;
+
if (contains(m_reserved_connectors, conn))
return nullptr;
Crtc* ResourceManager::reserve_crtc(Connector* conn)
{
+ if (!conn)
+ return nullptr;
+
if (Crtc* crtc = conn->get_current_crtc()) {
m_reserved_crtcs.push_back(crtc);
return crtc;
Plane* ResourceManager::reserve_plane(Crtc* crtc, PlaneType type, PixelFormat format)
{
+ if (!crtc)
+ return nullptr;
+
for (Plane* plane : crtc->get_possible_planes()) {
if (plane->plane_type() == type)
continue;
@@ -147,6 +156,9 @@ Plane* ResourceManager::reserve_plane(Crtc* crtc, PlaneType type, PixelFormat fo
Plane* ResourceManager::reserve_generic_plane(Crtc* crtc, PixelFormat format)
{
+ if (!crtc)
+ return nullptr;
+
for (Plane* plane : crtc->get_possible_planes()) {
if (plane->plane_type() == PlaneType::Cursor)
continue;