fix possible crash 3

hyprwm · Jul 20, 2024 · aa1ebc5 · aa1ebc5
1 parent 78d11c4
commit aa1ebc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
@@ -425,8 +425,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
         auto dev        = devIDFromFD(rendererFD);
 
         if (!dev.has_value()) {
-            LOGM(ERR, "failed to get drm dev");
-            PROTO::linuxDma.reset();
+            protoLog(ERR, "failed to get drm dev, disabling linux dmabuf");
+            removeGlobal();
             return;
         }
 
@@ -477,8 +477,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
 
         drmDevice* device = nullptr;
         if (drmGetDeviceFromDevId(mainDevice, 0, &device) != 0) {
-            LOGM(ERR, "failed to get drm dev");
-            PROTO::linuxDma.reset();
+            protoLog(ERR, "failed to get drm dev, disabling linux dmabuf");
+            removeGlobal();
             return;
         }
 
@@ -487,13 +487,14 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
             mainDeviceFD     = open(name, O_RDWR | O_CLOEXEC);
             drmFreeDevice(&device);
             if (mainDeviceFD < 0) {
-                LOGM(ERR, "failed to open drm dev");
-                PROTO::linuxDma.reset();
+                protoLog(ERR, "failed to open drm dev, disabling linux dmabuf");
+                removeGlobal();
                 return;
             }
         } else {
-            LOGM(ERR, "DRM device {} has no render node!!", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
+            protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
             drmFreeDevice(&device);
+            removeGlobal();
         }
     });
 }

diff --git a/src/protocols/MesaDRM.cpp b/src/protocols/MesaDRM.cpp
@@ -115,8 +115,8 @@ CMesaDRMProtocol::CMesaDRMProtocol(const wl_interface* iface, const int& ver, co
     drmDevice* dev   = nullptr;
     int        drmFD = g_pCompositor->m_iDRMFD;
     if (drmGetDevice2(drmFD, 0, &dev) != 0) {
-        LOGM(ERR, "Failed to get device");
-        PROTO::mesaDRM.reset();
+        protoLog(ERR, "Failed to get device, disabling MesaDRM");
+        removeGlobal();
         return;
     }
 
@@ -126,13 +126,13 @@ CMesaDRMProtocol::CMesaDRMProtocol(const wl_interface* iface, const int& ver, co
         ASSERT(dev->available_nodes & (1 << DRM_NODE_PRIMARY));
 
         if (!dev->nodes[DRM_NODE_PRIMARY]) {
-            LOGM(ERR, "No DRM render node available, both render and primary are null, disabling MesaDRM");
+            protoLog(ERR, "No DRM render node available, both render and primary are null, disabling MesaDRM");
             drmFreeDevice(&dev);
             removeGlobal();
             return;
         }
 
-        LOGM(WARN, "No DRM render node, falling back to primary {}", dev->nodes[DRM_NODE_PRIMARY]);
+        protoLog(WARN, "No DRM render node, falling back to primary {}", dev->nodes[DRM_NODE_PRIMARY]);
         nodeName = dev->nodes[DRM_NODE_PRIMARY];
     }
     drmFreeDevice(&dev);