X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibaxwin4.so_src%2Fwm.cpp;h=cae79c719a824d9c8005fe683eca2a746c8774ab;hb=b5f8fa2dea9d6a67ac5c8a3a442ee4570deaa56c;hp=7ce61e4b1bb70fd360255cfd1a28bd13c39b2b9c;hpb=7cbd63bd08b7a25dece2589403e330751a8ce2ef;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libaxwin4.so_src/wm.cpp b/Usermode/Libraries/libaxwin4.so_src/wm.cpp
index 7ce61e4b..cae79c71 100644
--- a/Usermode/Libraries/libaxwin4.so_src/wm.cpp
+++ b/Usermode/Libraries/libaxwin4.so_src/wm.cpp
@@ -11,6 +11,7 @@
 #include <vector>
 #include <algorithm>
 #include <mutex>
+#include <cassert>
 
 namespace AxWin {
 
@@ -22,7 +23,7 @@ extern "C" tAxWin4_Window *AxWin4_CreateWindow(const char *Name)
 {
 	// Allocate a window ID
 	::std::lock_guard<std::mutex>	lock(glWindowList);
-	int id = ::std::find(gWindowList.begin(), gWindowList.end(), nullptr) - gWindowList.end();
+	int id = ::std::find(gWindowList.begin(), gWindowList.end(), nullptr) - gWindowList.begin();
 	if( id >= MAX_WINDOW_ID ) {
 		throw ::std::runtime_error("AxWin4_CreateWindow - Out of IDs (TODO: Better exception)");
 	}
@@ -30,6 +31,7 @@ extern "C" tAxWin4_Window *AxWin4_CreateWindow(const char *Name)
 	{
 		gWindowList.push_back(nullptr);
 	}
+	assert(gWindowList[id] == nullptr);
 	
 	// Create window structure locally
 	tAxWin4_Window *ret = new tAxWin4_Window();
@@ -127,6 +129,10 @@ extern "C" void *AxWin4_GetWindowBuffer(tAxWin4_Window *Window)
 		
 		uint64_t handle = response.ReadU64();
 		Window->m_fd = _SysUnMarshalFD(handle);
+		if( Window->m_fd == -1 ) {
+			_SysDebug("AxWin4_GetWindowBuffer: Unable to unmarshal resultant FD (0x%llx)", handle);
+			return NULL;
+		}
 		
 		_SysDebug("AxWin4_GetWindowBuffer: %llx = %i", handle, Window->m_fd);
 	}