--- a/xmlsecurityengine/xmlsec/src/xmlsec_keyinfo.c	Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_keyinfo.c	Mon May 03 14:14:40 2010 +0300
@@ -770,9 +770,14 @@
     }		
     
     /* finally set key name if it is not there */
-    if(xmlSecKeyGetName(key) == NULL) {
-	xmlSecKeySetName(key, newName);
-    }
+    if(xmlSecKeyGetName(key) == NULL) 
+        {
+        if(xmlSecKeySetName(key, newName)<0)
+            {
+            xmlFree(newName);
+            return(-1);
+            }
+        }
     xmlFree(newName);
     return(0);
 }