krzosa/text_editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory corruption

Browse Source
This commit is contained in:
Krzosa Karol
2024-07-28 20:49:40 +02:00
parent 77a6cc5e53
commit 12b459507a
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/basic/basic.h
View File

@@ -1034,8 +1034,11 @@ inline TempArena GetScratch(Arena *c1 = NULL, Arena *c2 = NULL) {
struct Scratch {
TempArena checkpoint;
Scratch() { this->checkpoint = GetScratch(); }
Scratch(Arena *conflict) { this->checkpoint = GetScratch(conflict); }
Scratch(Arena *c1, Arena *c2) { this->checkpoint = GetScratch(c1, c2); }
Scratch(Allocator conflict) { this->checkpoint = GetScratch((Arena *)conflict.object); }
Scratch(Allocator c1, Allocator c2) { this->checkpoint = GetScratch((Arena *)c1.object, (Arena *)c2.object); }
~Scratch() { EndTemp(checkpoint); }
operator Arena *() { return checkpoint.arena; }
operator Allocator() { return *checkpoint.arena; }

2
src/basic/win32.cpp
View File

@@ -270,7 +270,7 @@ String GetExePath(Allocator allocator) {
}
String GetExeDir(Allocator allocator) {
Scratch scratch;
Scratch scratch((Arena *)allocator.object);
String path = GetExePath(scratch);
path = ChopLastSlash(path);
path = Copy(allocator, path);