diff -r a117e284a2c6 -r b09186059647 omadrm/drmengine/roapstorage/src/DRMDomainContext.cpp
--- a/omadrm/drmengine/roapstorage/src/DRMDomainContext.cpp	Tue Sep 28 14:08:58 2010 +0300
+++ b/omadrm/drmengine/roapstorage/src/DRMDomainContext.cpp	Thu Oct 14 13:45:23 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -442,8 +442,14 @@
         // Read the ContentID
         dataPart = HBufC8::NewL( aStream, KMaxUrlLength );
 
+        // Put dataPart to cleanup stack
+        CleanupStack::PushL( dataPart );
+        
         // assign the new content id
         iDomainKeys.AppendL( dataPart );
+        
+        // Pop dataPart from cleanup stack
+        CleanupStack::Pop( dataPart );
         }
 
     // Read the rights issuer ID