From 5be786c804d36e9950598a01cf39f05574af2acc Mon Sep 17 00:00:00 2001
From: MetaDucky <metaducky AT gmail DOT com>
Date: Wed, 20 Nov 2013 22:11:57 +0100
Subject: Fixed potential NULL pointer and leak when setting node metadata

---
 src/rollback_interface.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/rollback_interface.cpp')

diff --git a/src/rollback_interface.cpp b/src/rollback_interface.cpp
index 70a9e9457..808b07fed 100644
--- a/src/rollback_interface.cpp
+++ b/src/rollback_interface.cpp
@@ -340,7 +340,13 @@ bool RollbackAction::applyRevert(Map *map, InventoryManager *imgr, IGameDef *gam
 				if(n_old.meta != ""){
 					if(!meta){
 						meta = new NodeMetadata(gamedef);
-						map->setNodeMetadata(p, meta);
+						if(!map->setNodeMetadata(p, meta)){
+							delete meta;
+							infostream<<"RollbackAction::applyRevert(): "
+									<<"setNodeMetadata failed at "
+									<<PP(p)<<" for "<<n_old.name<<std::endl;
+							return false;
+						}
 					}
 					std::istringstream is(n_old.meta, std::ios::binary);
 					meta->deSerialize(is);
-- 
cgit v1.2.3