Merge pull request #5608 from microDev1/traceback

dhalbert · web-flow · commit 40a00c1e538d · 2021-11-22T12:38:18.000-05:00
Traceback object init - set it to empty only if null
diff --git a/py/objexcept.c b/py/objexcept.c
@@ -558,11 +558,10 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qs
         if (self->traceback == NULL) {
             self->traceback = &MP_STATE_VM(mp_emergency_traceback_obj);
         }
+        // populate traceback object
+        *self->traceback = mp_const_empty_traceback_obj;
     }
 
-    // populate traceback object
-    *self->traceback = mp_const_empty_traceback_obj;
-
     // append the provided traceback info to traceback data
     // if memory allocation fails (eg because gc is locked), just return
     if (self->traceback->data == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -558,11 +558,10 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qs`
`558`	`558`	`if (self->traceback == NULL) {`
`559`	`559`	`self->traceback = &MP_STATE_VM(mp_emergency_traceback_obj);`
`560`	`560`	`}`
	`561`	`+ // populate traceback object`
	`562`	`+ *self->traceback = mp_const_empty_traceback_obj;`
`561`	`563`	`}`
`562`	`564`
`563`		`- // populate traceback object`
`564`		`- *self->traceback = mp_const_empty_traceback_obj;`
`565`		`-`
`566`	`565`	`// append the provided traceback info to traceback data`
`567`	`566`	`// if memory allocation fails (eg because gc is locked), just return`
`568`	`567`	`if (self->traceback->data == NULL) {`