Fixes bug 781. Copy constructor for Expr needed to set the NodeManagerScope.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp
index dad437bc6..4fbb0cd33 100644
--- a/src/expr/expr_template.cpp
+++ b/src/expr/expr_template.cpp
@@ -82,16 +82,22 @@ Expr TypeCheckingException::getExpression() const throw() {
 Expr::Expr() :
   d_node(new Node),
   d_exprManager(NULL) {
+  // We do not need to wrap this in an ExprManagerScope as `new Node` is backed
+  // by NodeValue::null which is a static outside of a NodeManager.
 }
 
 Expr::Expr(ExprManager* em, Node* node) :
   d_node(node),
   d_exprManager(em) {
+  // We do not need to wrap this in an ExprManagerScope as this only initializes
+  // pointers
 }
 
 Expr::Expr(const Expr& e) :
-  d_node(new Node(*e.d_node)),
+  d_node(NULL),
   d_exprManager(e.d_exprManager) {
+  ExprManagerScope ems(*this);
+  d_node = new Node(*e.d_node);
 }
 
 Expr::~Expr() {