From: Auke Kok <sofar+github@foo-projects.org>
Date: Wed, 15 Mar 2017 07:04:53 +0000 (-0700)
Subject: Fix two nul deref if digging unknown nodes. (#5398)
X-Git-Tag: 0.4.16~387
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b539985ab827c2eb025ecb28cf1a97bdd3c75d58;p=oweals%2Fminetest.git

Fix two nul deref if digging unknown nodes. (#5398)

Introduced by d785456b3fa35faf47cb972fde9e8668382c5e22 (#5162)
---

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 7048dded1..671a994c7 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -496,7 +496,7 @@ function core.node_dig(pos, node, digger)
 	core.handle_node_drops(pos, drops, digger)
 
 	local oldmetadata = nil
-	if def.after_dig_node then
+	if def and def.after_dig_node then
 		oldmetadata = core.get_meta(pos):to_table()
 	end
 
@@ -504,7 +504,7 @@ function core.node_dig(pos, node, digger)
 	core.remove_node(pos)
 
 	-- Run callback
-	if def.after_dig_node then
+	if def and def.after_dig_node then
 		-- Copy pos and node because callback can modify them
 		local pos_copy = {x=pos.x, y=pos.y, z=pos.z}
 		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}