Commit 1ec0261518a8a0e302ebba28c96c4956ba323ce7 | 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 13:57:02-07:00
log	1ec0261518a8a0e302ebba28c96c4956ba323ce7
tree	2f9d3d60adda2c7573e81124285508b14a4671d2
parent	5c13a4e54a3ce814be02b75ef2029ceda6192bab

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

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

 @@ -517,7 +517,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");