TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: fix crash accessing python_tags via dict property

Browse Source 
Fixes #326
This commit is contained in:
rdb 2018-05-24 22:43:48 +02:00
parent ddc45e3529
commit 5c9705c21c
3 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panda/src/pgraph/pandaNode_ext.cxx
View File

@ -94,14 +94,9 @@ get_tag_keys() const {
*/ */
PyObject *Extension<PandaNode>:: PyObject *Extension<PandaNode>::
get_python_tags() { get_python_tags() {
if (_this->_python_tag_data == NULL) { PyObject *dict = do_get_python_tags();
_this->_python_tag_data = new PythonTagDataImpl; Py_INCREF(dict);
return dict;
} else if (_this->_python_tag_data->get_ref_count() > 1) {
// Copy-on-write.
_this->_python_tag_data = new PythonTagDataImpl(*(PythonTagDataImpl *)_this->_python_tag_data.p());
}
return ((PythonTagDataImpl *)_this->_python_tag_data.p())->_dict;
} }
/** /**
@ -116,7 +111,7 @@ get_python_tags() {
*/ */
int Extension<PandaNode>:: int Extension<PandaNode>::
set_python_tag(PyObject *key, PyObject *value) { set_python_tag(PyObject *key, PyObject *value) {
return PyDict_SetItem(get_python_tags(), key, value); return PyDict_SetItem(do_get_python_tags(), key, value);
} }
/** /**
@ -166,7 +161,7 @@ clear_python_tag(PyObject *key) {
return; return;
} }
PyObject *dict = get_python_tags(); PyObject *dict = do_get_python_tags();
if (PyDict_GetItem(dict, key) != NULL) { if (PyDict_GetItem(dict, key) != NULL) {
PyDict_DelItem(dict, key); PyDict_DelItem(dict, key);
} }
@ -201,6 +196,21 @@ __traverse__(visitproc visit, void *arg) {
return 0; return 0;
} }
/**
* Same as get_python_tags, without incrementing the reference count.
*/
PyObject *Extension<PandaNode>::
do_get_python_tags() {
if (_this->_python_tag_data == NULL) {
_this->_python_tag_data = new PythonTagDataImpl;
} else if (_this->_python_tag_data->get_ref_count() > 1) {
// Copy-on-write.
_this->_python_tag_data = new PythonTagDataImpl(*(PythonTagDataImpl *)_this->_python_tag_data.p());
}
return ((PythonTagDataImpl *)_this->_python_tag_data.p())->_dict;
}
/** /**
* Destroys the tags associated with the node. * Destroys the tags associated with the node.
*/ */

2
panda/src/pgraph/pandaNode_ext.h
View File

@ -45,6 +45,8 @@ public:
int __traverse__(visitproc visit, void *arg); int __traverse__(visitproc visit, void *arg);
private: private:
PyObject *do_get_python_tags();
// This is what actually stores the Python tags. // This is what actually stores the Python tags.
class PythonTagDataImpl : public PandaNode::PythonTagData { class PythonTagDataImpl : public PandaNode::PythonTagData {
public: public:

20
tests/pgraph/test_nodepath.py
View File

@ -1,3 +1,5 @@
import pytest, sys
def test_nodepath_empty(): def test_nodepath_empty():
"""Tests NodePath behavior for empty NodePaths.""" """Tests NodePath behavior for empty NodePaths."""
from panda3d.core import NodePath from panda3d.core import NodePath
@ -103,3 +105,21 @@ def test_weak_nodepath_comparison():
assert hash(path) == hash(weak) assert hash(path) == hash(weak)
assert weak.get_node_path() == path assert weak.get_node_path() == path
assert weak.node() == path.node() assert weak.node() == path.node()
def test_nodepath_python_tags():
from panda3d.core import NodePath
path = NodePath("node")
with pytest.raises(KeyError):
path.python_tags["foo"]
path.python_tags["foo"] = "bar"
assert path.python_tags["foo"] == "bar"
# Make sure reference count stays the same
rc1 = sys.getrefcount(path.python_tags)
rc2 = sys.getrefcount(path.python_tags)
assert rc1 == rc2