From 41a60f1eb3897a46bb7196c166b482cae416b7ff Mon Sep 17 00:00:00 2001
From: Tazpn <tazpn@users.sourceforge.net>
Date: Sat, 10 Jun 2006 22:33:22 +0000
Subject: [PATCH] Fix reference counting in base objects and crash in NiNode
for some Nif files.
---
Ref.h | 7 ++++++-
obj/NiNode.cpp | 2 +-
obj/NiObject.cpp | 4 +---
obj/NiObject.h | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Ref.h b/Ref.h
index 4e7b6d9a..05335328 100644
--- a/Ref.h
+++ b/Ref.h
@@ -38,7 +38,12 @@ protected:
};
template <class T>
-Ref<T>::Ref( T * object ) : _object(object) {}
+Ref<T>::Ref( T * object ) : _object(object) {
+ //If object isn't null, increment reference count
+ if ( _object != NULL ) {
+ _object->AddRef();
+ }
+}
template <class T>
Ref<T>::Ref(const Ref & ref_to_copy ) {
diff --git a/obj/NiNode.cpp b/obj/NiNode.cpp
index 947040a8..681e9824 100644
--- a/obj/NiNode.cpp
+++ b/obj/NiNode.cpp
@@ -70,7 +70,7 @@ void NiNode::RemoveChild( Ref<NiAVObject> obj ) {
void NiNode::ClearChildren() {
for ( vector< NiAVObjectRef >::iterator it = children.begin(); it != children.end(); ++it) {
- (*it)->SetParent(NULL);
+ if (*it) (*it)->SetParent(NULL);
}
children.clear();
}
diff --git a/obj/NiObject.cpp b/obj/NiObject.cpp
index 2bf16bec..5a0c4c0c 100644
--- a/obj/NiObject.cpp
+++ b/obj/NiObject.cpp
@@ -33,9 +33,7 @@ void NiObject::AddRef() {
}
void NiObject::SubtractRef() {
- --_ref_count;
-
- if ( _ref_count < 0 ) {
+ if ( --_ref_count == 0 ) {
delete this;
}
}
diff --git a/obj/NiObject.h b/obj/NiObject.h
index 104a4603..65599444 100644
--- a/obj/NiObject.h
+++ b/obj/NiObject.h
@@ -151,7 +151,7 @@ template <class T> Ref<T> StaticCast( NiObject * object ) {
return (T*)object;
}
-template <class T> const Ref<T> SaticCast (const NiObject * object) {
+template <class T> Ref<const T> StaticCast (const NiObject * object) {
return (const T*)object;
}
@@ -163,7 +163,7 @@ template <class T> Ref<T> DynamicCast( NiObject * object ) {
}
}
-template <class T> const Ref<T> DynamicCast( const NiObject * object ) {
+template <class T> Ref<const T> DynamicCast( const NiObject * object ) {
if ( object->IsDerivedType(T::TYPE) ) {
return (const T*)object;
} else {
--
GitLab