@@ -1152,7 +1152,7 @@ set_frozen_error(frozen_status status, PyObject *modname)
11521152}
11531153
11541154struct frozen_info {
1155- PyObject * name ;
1155+ PyObject * nameobj ;
11561156 const char * data ;
11571157 Py_ssize_t size ;
11581158 bool is_package ;
@@ -1162,7 +1162,7 @@ static frozen_status
11621162find_frozen (PyObject * nameobj , struct frozen_info * info )
11631163{
11641164 if (info != NULL ) {
1165- info -> name = NULL ;
1165+ info -> nameobj = NULL ;
11661166 info -> data = NULL ;
11671167 info -> size = 0 ;
11681168 info -> is_package = false;
@@ -1192,7 +1192,7 @@ find_frozen(PyObject *nameobj, struct frozen_info *info)
11921192 }
11931193 }
11941194 if (info != NULL ) {
1195- info -> name = nameobj ; // borrowed
1195+ info -> nameobj = nameobj ; // borrowed
11961196 info -> data = (const char * )p -> code ;
11971197 info -> size = p -> size < 0 ? - (p -> size ) : p -> size ;
11981198 info -> is_package = p -> size < 0 ? true : false;
@@ -1213,14 +1213,14 @@ unmarshal_frozen_code(struct frozen_info *info)
12131213{
12141214 PyObject * co = PyMarshal_ReadObjectFromString (info -> data , info -> size );
12151215 if (co == NULL ) {
1216- set_frozen_error (FROZEN_INVALID , info -> name );
1216+ set_frozen_error (FROZEN_INVALID , info -> nameobj );
12171217 return NULL ;
12181218 }
12191219 if (!PyCode_Check (co )) {
12201220 // We stick with TypeError for backward compatibility.
12211221 PyErr_Format (PyExc_TypeError ,
12221222 "frozen object %R is not a code object" ,
1223- info -> name );
1223+ info -> nameobj );
12241224 Py_DECREF (co );
12251225 return NULL ;
12261226 }
@@ -2050,7 +2050,7 @@ _imp_get_frozen_object_impl(PyObject *module, PyObject *name,
20502050{
20512051 struct frozen_info info ;
20522052 if (PyBytes_Check (dataobj )) {
2053- info .name = name ;
2053+ info .nameobj = name ;
20542054 info .data = PyBytes_AS_STRING (dataobj );
20552055 info .size = PyBytes_Size (dataobj );
20562056 if (info .size == 0 ) {
0 commit comments