From 933e6a4579b1936cda7a16586c4fdb1607854fbf Mon Sep 17 00:00:00 2001 From: rarified Date: Sun, 29 Dec 2019 11:21:39 -0700 Subject: [PATCH] Add assertion/check for NIL key in plNetResManager::IKeyUnreffed() --- .../PubUtilLib/plNetCommon/plNetResManager.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp index a3a48bc7..e7418727 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp @@ -66,7 +66,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "../pnKeyedObject/hsKeyedObject.h" #include "../pnFactory/plCreatable.h" #include "../pnNetCommon/plNetApp.h" -#include "hsStream.h" +#include "hsStream.h" plNetResManager::plNetResManager() { @@ -92,11 +92,19 @@ plCreatable* plNetResManager::IReadCreatable(hsStream* s) const return nil; } -void plNetResManager::IKeyReffed(plKeyImp* key) +void plNetResManager::IKeyReffed(plKeyImp* key) { } -void plNetResManager::IKeyUnreffed(plKeyImp* key) -{ - delete key; +void plNetResManager::IKeyUnreffed(plKeyImp* key) +{ +// Expanded even with HS_DEBUGGING undefined. XXX +// hsAssert( key != nil, "NetResMgr::NIL key to Unref" ); + if (key == nil) { + ErrorAssert(104, + "H:\\projects\\OpenURU\\Repo\\Foundry-CWE-ou-minkata\\MOULOpenSourceClientPlugin\\Plasma20\\Sources\\Plasma\\PubUtilLib\\plNetCommon\\plNetResManager.cpp", + "NetResMgr::NIL key to Unref"); + } else { + delete key; + } }