From 85194b499f339493a957558b622c9d8da809be82 Mon Sep 17 00:00:00 2001
From: sean yu <55464069+hexbabe@users.noreply.github.com>
Date: Wed, 4 Feb 2026 08:34:58 -0500
Subject: [PATCH] Fix null camera enum windows (#681)

---
 pkg/driver/camera/camera_windows.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkg/driver/camera/camera_windows.cpp b/pkg/driver/camera/camera_windows.cpp
index 061f21d..b7346f3 100644
--- a/pkg/driver/camera/camera_windows.cpp
+++ b/pkg/driver/camera/camera_windows.cpp
@@ -71,6 +71,13 @@ int listCamera(cameraList* list, const char** errstr)
 
   safeRelease(&sysDevEnum);
 
+  if (enumMon == nullptr)
+  {
+    list->num = 0;
+    list->name = nullptr;
+    return 0;
+  }
+
   {
     IMoniker* moniker;
     list->num = 0;
@@ -138,6 +145,12 @@ int selectCamera(camera* cam, IMoniker** monikerSelected, const char** errstr)
 
   safeRelease(&sysDevEnum);
 
+  if (enumMon == nullptr)
+  {
+    *errstr = errEnumDevice;
+    return 0;
+  }
+
   {
     IMoniker* moniker;
     while (enumMon->Next(1, &moniker, nullptr) == S_OK)