Merge pull request adafruit#5300 from kamtom480/fix_movable

microdev1 · web-flow · commit 119cc8488bcf · 2021-09-05T09:46:07.000+05:30
Fix incorrect use of allocate_memory()
diff --git a/main.c b/main.c
@@ -236,7 +236,7 @@ STATIC void cleanup_after_vm(supervisor_allocation* heap, mp_obj_t exception) {
             size_t traceback_len = 0;
             mp_print_t print_count = {&traceback_len, count_strn};
             mp_obj_print_exception(&print_count, exception);
-            prev_traceback_allocation = allocate_memory(align32_size(traceback_len + 1), false, true);
+            prev_traceback_allocation = allocate_memory(align32_size(traceback_len + 1), false, false);
             // Empirically, this never fails in practice - even when the heap is totally filled up
             // with single-block-sized objects referenced by a root pointer, exiting the VM frees
             // up several hundred bytes, sufficient for the traceback (which tends to be shortened
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
@@ -195,7 +195,7 @@ STATIC mp_obj_t supervisor_set_next_code_file(size_t n_args, const mp_obj_t *pos
     const char *filename = mp_obj_str_get_data(args.filename.u_obj, &len);
     free_memory(next_code_allocation);
     if (options != 0 || len != 0) {
-        next_code_allocation = allocate_memory(align32_size(sizeof(next_code_info_t) + len + 1), false, true);
+        next_code_allocation = allocate_memory(align32_size(sizeof(next_code_info_t) + len + 1), false, false);
         if (next_code_allocation == NULL) {
             m_malloc_fail(sizeof(next_code_info_t) + len + 1);
         }

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ STATIC mp_obj_t supervisor_set_next_code_file(size_t n_args, const mp_obj_t *pos`
`195`	`195`	`const char *filename = mp_obj_str_get_data(args.filename.u_obj, &len);`
`196`	`196`	`free_memory(next_code_allocation);`
`197`	`197`	`if (options != 0 \|\| len != 0) {`
`198`		`- next_code_allocation = allocate_memory(align32_size(sizeof(next_code_info_t) + len + 1), false, true);`
	`198`	`+ next_code_allocation = allocate_memory(align32_size(sizeof(next_code_info_t) + len + 1), false, false);`
`199`	`199`	`if (next_code_allocation == NULL) {`
`200`	`200`	`m_malloc_fail(sizeof(next_code_info_t) + len + 1);`
`201`	`201`	`}`