Fix reset property

Change-Id: I027f13e452663fe6fd1547bb64fd88026c6f42c7

diff --git a/TEEStub/PropertyAccess/PropertyApi.cpp b/TEEStub/PropertyAccess/PropertyApi.cpp
index da9da5e..323e489 100644 (file)
--- a/TEEStub/PropertyAccess/PropertyApi.cpp
+++ b/TEEStub/PropertyAccess/PropertyApi.cpp
@@ -358,8 +358,15 @@ void TEE_StartPropertyEnumerator(TEE_PropSetHandle enumerator,
 }\r
 \r
 void TEE_ResetPropertyEnumerator(TEE_PropSetHandle enumerator) {\r
-       PropertyEnumHandle* enumeratorHandle = (PropertyEnumHandle*)enumerator;\r
-       if (enumeratorHandle->property) delete enumeratorHandle->property;\r
+       Property* targetProperty = _GetTargetProperty(enumerator);
+       if (targetProperty != NULL
+                       && targetProperty != teeProperty
+                       && targetProperty != clientProperty
+                       && targetProperty != taProperty) {
+               PropertyEnumHandle* enumeratorHandle = (PropertyEnumHandle*)enumerator;
+               delete enumeratorHandle->property;
+               enumeratorHandle->property = NULL;
+       }
 }\r
 \r
 /*\r