Fix crash if NodeResolver destroyed before pending any node resolutions

kwolekr · kwolekr · commit d91559b8f08a · 2015-01-03T11:05:31.000-05:00
diff --git a/src/nodedef.h b/src/nodedef.h
@@ -402,9 +402,9 @@ class NodeResolver {
 		m_ndef = NULL;
 	}
 
-	~NodeResolver()
+	virtual ~NodeResolver()
 	{
-		if (!m_lookup_done)
+		if (!m_lookup_done && m_ndef)
 			m_ndef->cancelNodeResolve(this);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -402,9 +402,9 @@ class NodeResolver {`
`402`	`402`	`m_ndef = NULL;`
`403`	`403`	`}`
`404`	`404`
`405`		`- ~NodeResolver()`
	`405`	`+ virtual ~NodeResolver()`
`406`	`406`	`{`
`407`		`- if (!m_lookup_done)`
	`407`	`+ if (!m_lookup_done && m_ndef)`
`408`	`408`	`m_ndef->cancelNodeResolve(this);`
`409`	`409`	`}`
`410`	`410`