Build fixes and minor corrections.

1 files changed, 6 insertions, 2 deletions

diff --git a/trace.py b/trace.py
index 368462a..164c977 100644
--- a/trace.py
+++ b/trace.py
@@ -238,7 +238,9 @@ class Wrapper(stdapi.Visitor):
         pass
 
     def visit_pointer(self, pointer, instance):
+        print "    if (%s) {" % instance
         self.visit(pointer.type, "*" + instance)
+        print "    }"
 
     def visit_handle(self, handle, instance):
         self.visit(handle.type, instance)
@@ -252,8 +254,9 @@ class Wrapper(stdapi.Visitor):
     def visit_interface(self, interface, instance):
         assert instance.startswith('*')
         instance = instance[1:]
-        print "    if (%s)" % instance
+        print "    if (%s) {" % instance
         print "        %s = new %s(%s);" % (instance, interface_wrap_name(interface), instance)
+        print "    }"
 
 
 class Unwrapper(Wrapper):
@@ -261,8 +264,9 @@ class Unwrapper(Wrapper):
     def visit_interface(self, interface, instance):
         assert instance.startswith('*')
         instance = instance[1:]
-        print "    if (%s)" % instance
+        print "    if (%s) {" % instance
         print "        %s = static_cast<%s *>(%s)->m_pInstance;" % (instance, interface_wrap_name(interface), instance)
+        print "    }"
 
 
 wrap_instance = Wrapper().visit