Commit 81890e30e2d51577e6c79b3a620115b6fbbf2071 | zig

author	Nathanaël Courant <nathanael.courant@inria.fr> 2020-12-07 23:27:37+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-12-08 15:53:34-05:00
log	81890e30e2d51577e6c79b3a620115b6fbbf2071
tree	06937163312d3133cfe448451e0890248758ecc6
parent	58c8ad8ea8698807934cdd05df821d39499a9ab6

1 files changed, 5 insertions(+), 1 deletions(-)

lib/std/heap/general_purpose_allocator.zig+5-1

 @@ -528,7 +528,11 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
                         second_free_stack_trace,
                     });
                     if (new_size == 0) {
-                        // Recoverable.
+                        // Recoverable. Restore self.total_requested_bytes if needed, as we
+                        // don't return an error value so the errdefer above does not run.
+                        if (config.enable_memory_limit) {
+                            self.total_requested_bytes = prev_req_bytes;
+                        }
                         return @as(usize, 0);
                     }
                     @panic("Unrecoverable double free");