Commit 138e5cbc authored by Stefan Behnel's avatar Stefan Behnel

fix ticket #604: refcounting bugs in 'from ... import *'

parent 046270e7
...@@ -1657,7 +1657,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1657,7 +1657,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.putln("if (!(%s)) %s;" % ( code.putln("if (!(%s)) %s;" % (
entry.type.type_test_code("o"), entry.type.type_test_code("o"),
code.error_goto(entry.pos))) code.error_goto(entry.pos)))
code.put_var_decref(entry) code.putln("Py_INCREF(o);")
code.put_decref(entry.cname, entry.type, nanny=False)
code.putln("%s = %s;" % ( code.putln("%s = %s;" % (
entry.cname, entry.cname,
PyrexTypes.typecast(entry.type, py_object_type, "o"))) PyrexTypes.typecast(entry.type, py_object_type, "o")))
...@@ -1670,7 +1671,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1670,7 +1671,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
rhs, rhs,
entry.type.error_condition(entry.cname), entry.type.error_condition(entry.cname),
code.error_goto(entry.pos))) code.error_goto(entry.pos)))
code.putln("Py_DECREF(o);")
else: else:
code.putln('PyErr_Format(PyExc_TypeError, "Cannot convert Python object %s to %s");' % (name, entry.type)) code.putln('PyErr_Format(PyExc_TypeError, "Cannot convert Python object %s to %s");' % (name, entry.type))
code.putln(code.error_goto(entry.pos)) code.putln(code.error_goto(entry.pos))
...@@ -1679,12 +1679,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1679,12 +1679,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.putln("if (PyObject_SetAttr(%s, py_name, o) < 0) goto bad;" % Naming.module_cname) code.putln("if (PyObject_SetAttr(%s, py_name, o) < 0) goto bad;" % Naming.module_cname)
code.putln("}") code.putln("}")
code.putln("return 0;") code.putln("return 0;")
code.put_label(code.error_label) if code.label_used(code.error_label):
# This helps locate the offending name. code.put_label(code.error_label)
code.putln('__Pyx_AddTraceback("%s");' % self.full_module_name); # This helps locate the offending name.
code.putln('__Pyx_AddTraceback("%s");' % self.full_module_name);
code.error_label = old_error_label code.error_label = old_error_label
code.putln("bad:") code.putln("bad:")
code.putln("Py_DECREF(o);")
code.putln("return -1;") code.putln("return -1;")
code.putln("}") code.putln("}")
code.putln(import_star_utility_code) code.putln(import_star_utility_code)
......
cdef object executable, version_info
cdef long hexversion
from sys import *
def test_cdefed_objects():
"""
>>> ex, vi = test_cdefed_objects()
>>> assert ex is not None
>>> assert vi is not None
"""
return executable, version_info
def test_cdefed_cvalues():
"""
>>> hexver = test_cdefed_cvalues()
>>> assert hexver is not None
>>> assert hexver > 0x02020000
"""
return hexversion
def test_non_cdefed_names():
"""
>>> mod, pth = test_non_cdefed_names()
>>> assert mod is not None
>>> assert pth is not None
"""
return modules, path
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment