@@ -912,47 +912,59 @@ PyObject *read_typetree_value_array(ReaderT *reader, TypeTreeNodeObject *node, T
912912 return value;
913913}
914914
915+ static inline void set_none_if_null_n_incref (PyObject **field)
916+ {
917+ if (*field == nullptr )
918+ {
919+ *field = Py_None;
920+ }
921+ Py_INCREF (*field);
922+ }
923+
915924PyObject *read_typetree (PyObject *self, PyObject *args, PyObject *kwargs)
916925{
917926 const char *kwlist[] = {" data" , " node" , " endian" , " as_dict" , " assetsfile" , " classes" , NULL };
918- PyObject *data ;
927+ Py_buffer view ;
919928 PyObject *node;
920- PyObject *as_dict = Py_True;
929+ int as_dict = 1 ;
930+ PyObject *value = nullptr ;
931+ ReaderT reader;
932+
933+ volatile uint16_t bint = 0x0100 ;
934+ volatile bool is_big_endian = ((uint8_t *)&bint)[0 ] == 1 ;
921935
922936 TypeTreeReaderConfigT config = {
923937 false ,
924- Py_None ,
925- Py_None ,
938+ nullptr ,
939+ nullptr ,
926940 false ,
927941 };
928942
929943 char endian;
930944 bool swap;
931945
932- if (! PyArg_ParseTupleAndKeywords (args, kwargs, " OOC|OOO " , (char **)kwlist, &data , &node, &endian, &as_dict, &config.assetfile , &config.classes ))
946+ int parse_result = PyArg_ParseTupleAndKeywords (args, kwargs, " y*OC|pOO " , (char **)kwlist, &view , &node, &endian, &as_dict, &config.assetfile , &config.classes );
933947 {
934- return NULL ;
948+ goto READ_TYPETREE_CLEANUP ;
935949 }
936950
937- config.as_dict = as_dict == Py_True;
951+ set_none_if_null_n_incref (&config.assetfile );
952+ set_none_if_null_n_incref (&config.classes );
953+
954+ config.as_dict = as_dict == 1 ;
938955 if (!config.as_dict )
939956 {
940957 if (config.assetfile == Py_None)
941958 {
942959 PyErr_SetString (PyExc_ValueError, " assetsfile must be set if not as dict" );
943- return NULL ;
960+ goto READ_TYPETREE_CLEANUP ;
944961 }
945962 if (config.classes == Py_None)
946963 {
947964 PyErr_SetString (PyExc_ValueError, " classes must be set if not as dict" );
948- return NULL ;
965+ goto READ_TYPETREE_CLEANUP ;
949966 }
950967 }
951- Py_INCREF (config.assetfile );
952- Py_INCREF (config.classes );
953-
954- volatile uint16_t bint = 0x0100 ;
955- volatile bool is_big_endian = ((uint8_t *)&bint)[0 ] == 1 ;
956968
957969 switch (endian)
958970 {
@@ -985,19 +997,8 @@ PyObject *read_typetree(PyObject *self, PyObject *args, PyObject *kwargs)
985997 }
986998 }
987999
988- Py_buffer view;
989-
990- if (PyObject_GetBuffer (data, &view, PyBUF_SIMPLE) == -1 )
991- {
992- Py_DECREF (config.assetfile );
993- Py_DECREF (config.classes );
994- PyErr_SetString (PyExc_ValueError, " Failed to get buffer" );
995- return NULL ;
996- }
997-
998- ReaderT reader = {static_cast <uint8_t *>(view.buf ), static_cast <uint8_t *>(view.buf ) + view.len , static_cast <uint8_t *>(view.buf )};
1000+ reader = {static_cast <uint8_t *>(view.buf ), static_cast <uint8_t *>(view.buf ) + view.len , static_cast <uint8_t *>(view.buf )};
9991001
1000- PyObject *value;
10011002 if (swap)
10021003 {
10031004 value = read_typetree_value<true >(&reader, (TypeTreeNodeObject *)node, &config);
@@ -1007,21 +1008,22 @@ PyObject *read_typetree(PyObject *self, PyObject *args, PyObject *kwargs)
10071008 value = read_typetree_value<false >(&reader, (TypeTreeNodeObject *)node, &config);
10081009 }
10091010
1010- PyBuffer_Release (&view);
1011- Py_DECREF (config.assetfile );
1012- Py_DECREF (config.classes );
1013-
10141011 if (reader.ptr != reader.end )
10151012 {
10161013 Py_DecRef (value);
1017- return PyErr_Format (PyExc_ValueError, " Read %ld bytes, %ld remaining" , reader.ptr - reader.start , reader.end - reader.ptr );
1014+ value = PyErr_Format (PyExc_ValueError, " Read %ld bytes, %ld remaining" , reader.ptr - reader.start , reader.end - reader.ptr );
10181015 }
10191016
1017+ READ_TYPETREE_CLEANUP :
1018+ PyBuffer_Release (&view);
1019+ Py_DECREF (config.assetfile );
1020+ Py_DECREF (config.classes );
1021+
10201022 return value;
10211023}
10221024
10231025// TypeTreeNode impl
1024- static void TypeTreeNode_dealloc (TypeTreeNodeObject *self)
1026+ static void TypeTreeNode_finalize (TypeTreeNodeObject *self)
10251027{
10261028 Py_XDECREF (self->m_Level );
10271029 Py_XDECREF (self->m_Type );
@@ -1035,7 +1037,6 @@ static void TypeTreeNode_dealloc(TypeTreeNodeObject *self)
10351037 Py_XDECREF (self->m_RefTypeHash );
10361038 Py_XDECREF (self->m_Children );
10371039 Py_XDECREF (self->_clean_name );
1038- Py_TYPE (self)->tp_free ((PyObject *)self);
10391040}
10401041
10411042static const std::map<const char *, NodeDataType> typeToNodeDataType = {
@@ -1093,15 +1094,6 @@ static inline NodeDataType get_node_data_type(PyObject *py_type)
10931094 return NodeDataType::unk;
10941095}
10951096
1096- static inline void set_none_if_null_n_incref (PyObject **field)
1097- {
1098- if (*field == nullptr )
1099- {
1100- *field = Py_None;
1101- }
1102- Py_INCREF (*field);
1103- }
1104-
11051097static int TypeTreeNode_init (TypeTreeNodeObject *self, PyObject *args, PyObject *kwargs)
11061098{
11071099 const char *kwlist[] = {
@@ -1209,8 +1201,8 @@ static PyTypeObject TypeTreeNodeType = []() -> PyTypeObject
12091201 type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
12101202 type.tp_new = PyType_GenericNew;
12111203 type.tp_init = (initproc)TypeTreeNode_init;
1212- type.tp_dealloc = (destructor)TypeTreeNode_dealloc;
12131204 type.tp_members = TypeTreeNode_members;
1205+ type.tp_finalize = (destructor)TypeTreeNode_finalize;
12141206 return type;
12151207}();
12161208
0 commit comments