Skip to content

fix ds_priority segfaults #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cobaltgit wants to merge 5 commits into
base: main
Choose a base branch
from
+75 −57
Open

fix ds_priority segfaults #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de1708b
fix ds_priority segfaults
cobaltgit Aug 14, 2026
cb25aff
accuracy fixes?
cobaltgit Aug 15, 2026
28edf64
unreal
cobaltgit Aug 15, 2026
f452e6a
nvm yeah priority is real
cobaltgit Aug 15, 2026
9d909e8
change you
cobaltgit Aug 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/runner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ typedef struct {

// ds_priority queue item
typedef struct {
int32_t depth;
GMLReal depth;
RValue item;
} DsPriorityItem;

Expand Down
130 changes: 74 additions & 56 deletions src/vm_builtins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5721,6 +5721,34 @@ static DsPriority* dsPriorityGet(Runner* runner, int32_t id) {
return &runner->dsPriorityPool[id];
}

// Value equality used by ds_priority, mirroring the HTML5 runner's ds_priority.js:
// - When both values are numbers (any GML numeric type; they are all plain JS numbers there),
// they match when |a - b| < GML_MATH_EPSILON.
// - Otherwise values must be equal by content (strings) or identity (the rest).
static bool dsPriorityValuesEqual(RValue a, RValue b) {
bool aNumeric = a.type == RVALUE_REAL || a.type == RVALUE_INT32 || a.type == RVALUE_INT64 || a.type == RVALUE_BOOL || a.type == RVALUE_ASSETREF;
bool bNumeric = b.type == RVALUE_REAL || b.type == RVALUE_INT32 || b.type == RVALUE_INT64 || b.type == RVALUE_BOOL || b.type == RVALUE_ASSETREF;
if (aNumeric && bNumeric) {
return GML_MATH_EPSILON > GMLReal_fabs(RValue_toReal(a) - RValue_toReal(b));
}
switch (a.type) {
case RVALUE_STRING:
return b.type == RVALUE_STRING && a.string != nullptr && b.string != nullptr && strcmp(a.string, b.string) == 0;
case RVALUE_ARRAY:
return b.type == RVALUE_ARRAY && a.array == b.array;
#if IS_WAD17_OR_HIGHER_ENABLED
case RVALUE_METHOD:
return b.type == RVALUE_METHOD && a.method == b.method;
#endif
case RVALUE_STRUCT:
return b.type == RVALUE_STRUCT && a.structInst == b.structInst;
case RVALUE_UNDEFINED:
return b.type == RVALUE_UNDEFINED;
default:
return false;
}
}

static RValue builtin_ds_priority_create(MAYBE_UNUSED VMContext* ctx, MAYBE_UNUSED RValue* args, MAYBE_UNUSED int32_t argCount) {
return RValue_makeReal((GMLReal) dsPriorityCreate(ctx->runner));
}
Expand Down Expand Up @@ -5758,20 +5786,20 @@ static RValue builtin_ds_priority_copy(VMContext* ctx, RValue* args, MAYBE_UNUSE
int32_t srcId = RValue_toInt32(args[1]);
DsPriority* dest = dsPriorityGet(runner, destId);
DsPriority* src = dsPriorityGet(runner, srcId);
if (dest == nullptr || src == nullptr) return RValue_makeUndefined();
if (dest == nullptr || src == nullptr || dest == src) return RValue_makeUndefined();
repeat(arrlen(dest->items), i) {
RValue_free(&dest->items[i].item);
dest->items[i].depth = 0;
}
arrfree(dest->items);
dest->items = nullptr;
{
repeat(arrlen(src->items), i) {
DsPriorityItem item;
item.item = RValue_makeIndependent(src->items[i].item);
item.depth = src->items[i].depth;
arrput(dest->items, item);
}
repeat(arrlen(src->items), i) {
DsPriorityItem item;
item.item = RValue_makeIndependent(src->items[i].item);
item.depth = src->items[i].depth;
arrput(dest->items, item);
}
}
return RValue_makeUndefined();
}
Expand All @@ -5792,30 +5820,29 @@ static RValue builtin_ds_priority_empty(MAYBE_UNUSED VMContext* ctx, RValue* arg

static RValue builtin_ds_priority_add(MAYBE_UNUSED VMContext* ctx, RValue* args, MAYBE_UNUSED int32_t argCount) {
int32_t id = RValue_toInt32(args[0]);
int32_t prio = RValue_toInt32(args[2]);
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();

DsPriorityItem item;
item.depth = prio;
item.depth = RValue_toReal(args[2]);
item.item = RValue_makeIndependent(args[1]);

DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
arrput(pQueue->items, item);
return RValue_makeUndefined();
}

static RValue builtin_ds_priority_change_priority(MAYBE_UNUSED VMContext* ctx, RValue* args, MAYBE_UNUSED int32_t argCount) {
int32_t id = RValue_toInt32(args[0]);
RValue val = args[1];
int32_t prio = RValue_toInt32(args[2]);
GMLReal prio = RValue_toReal(args[2]);
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
for (int32_t i = 0; i < (int32_t) arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (&item->item == &val) {
if (dsPriorityValuesEqual(item->item, val)) {
DsPriorityItem moved = *item;
arrdel(pQueue->items, i);
item->depth = prio;
arrput(pQueue->items, *item);
moved.depth = prio;
arrput(pQueue->items, moved);
break;
}
}
Expand All @@ -5826,15 +5853,11 @@ static RValue builtin_ds_priority_find_priority(VMContext* ctx, RValue* args, MA
int32_t id = RValue_toInt32(args[0]);
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
RValue value = RValue_makeIndependent(args[1]);
RValue value = args[1];
for (int32_t i = 0; i < (int32_t) arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (item->item.type == RVALUE_REAL && value.type == RVALUE_REAL) {
if (GML_MATH_EPSILON > GMLReal_fabs(item->item.real - value.real)) {
return RValue_makeReal((GMLReal) item->depth);
}
} else if (memcmp(&item->item, &value, sizeof(RValue)) == 0) {
return RValue_makeReal((GMLReal) item->depth);
if (dsPriorityValuesEqual(item->item, value)) {
return RValue_makeReal(item->depth);
}
}
return RValue_makeUndefined();
Expand All @@ -5844,15 +5867,10 @@ static RValue builtin_ds_priority_delete_value(VMContext* ctx, RValue* args, MAY
int32_t id = RValue_toInt32(args[0]);
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
RValue value = RValue_makeIndependent(args[1]);
RValue value = args[1];
for (int32_t i = 0; i < (int32_t) arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (item->item.type == RVALUE_REAL && value.type == RVALUE_REAL) {
if (GML_MATH_EPSILON > GMLReal_fabs(item->item.real - value.real)) {
arrdel(pQueue->items, i);
return RValue_makeUndefined();
}
} else if (memcmp(&item->item, &value, sizeof(RValue)) == 0) {
if (dsPriorityValuesEqual(item->item, value)) {
arrdel(pQueue->items, i);
return RValue_makeUndefined();
}
Expand All @@ -5864,14 +5882,14 @@ static RValue builtin_ds_priority_delete_min(MAYBE_UNUSED VMContext* ctx, RValue
int32_t id = (int32_t) RValue_toReal(args[0]);
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
if (arrlen(pQueue->items) <= 0) return RValue_makeUndefined();
GMLReal minDepth = (GMLReal) INT32_MAX;
DsPriorityItem* minNode = nullptr;
int32_t minIndex = -1;
for (int32_t i = 0; i < arrlen(pQueue->items); i++) {
if (arrlen(pQueue->items) <= 0) return RValue_makeReal(0.0);
GMLReal minDepth = pQueue->items[0].depth;
DsPriorityItem* minNode = &pQueue->items[0];
int32_t minIndex = 0;
for (int32_t i = 1; i < arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (item->depth < minDepth) {
minDepth = (GMLReal) item->depth;
if (item->depth < minDepth) { // strictly less: oldest item wins ties, like the sorted list's head
minDepth = item->depth;
minNode = item;
minIndex = i;
}
Expand All @@ -5886,12 +5904,12 @@ static RValue builtin_ds_priority_find_min(MAYBE_UNUSED VMContext* ctx, RValue*
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
if (arrlen(pQueue->items) <= 0) return RValue_makeUndefined();
GMLReal minDepth = (GMLReal) INT32_MAX;
DsPriorityItem* minNode = nullptr;
for (int32_t i = 0; i < arrlen(pQueue->items); i++) {
GMLReal minDepth = pQueue->items[0].depth;
DsPriorityItem* minNode = &pQueue->items[0];
for (int32_t i = 1; i < arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (item->depth < minDepth) {
minDepth = (GMLReal) item->depth;
minDepth = item->depth;
minNode = item;
}
}
Expand All @@ -5902,14 +5920,14 @@ static RValue builtin_ds_priority_delete_max(MAYBE_UNUSED VMContext* ctx, RValue
int32_t id = (int32_t) RValue_toReal(args[0]);
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
if (arrlen(pQueue->items) <= 0) return RValue_makeUndefined();
GMLReal maxDepth = (GMLReal) INT32_MIN;
DsPriorityItem* maxNode = nullptr;
int32_t maxIndex = -1;
for (int32_t i = 0; i < arrlen(pQueue->items); i++) {
if (arrlen(pQueue->items) <= 0) return RValue_makeReal(0.0);
GMLReal maxDepth = pQueue->items[0].depth;
DsPriorityItem* maxNode = &pQueue->items[0];
int32_t maxIndex = 0;
for (int32_t i = 1; i < arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (item->depth > maxDepth) {
maxDepth = (GMLReal) item->depth;
if (item->depth >= maxDepth) { // greater-or-equal: newest item wins ties, like the sorted list's tail
maxDepth = item->depth;
maxNode = item;
maxIndex = i;
}
Expand All @@ -5924,12 +5942,12 @@ static RValue builtin_ds_priority_find_max(MAYBE_UNUSED VMContext* ctx, RValue*
DsPriority* pQueue = dsPriorityGet(ctx->runner, id);
if (pQueue == nullptr) return RValue_makeUndefined();
if (arrlen(pQueue->items) <= 0) return RValue_makeUndefined();
GMLReal maxDepth = (GMLReal) INT32_MIN;
DsPriorityItem* maxNode = nullptr;
for (int32_t i = 0; i < arrlen(pQueue->items); i++) {
GMLReal maxDepth = pQueue->items[0].depth;
DsPriorityItem* maxNode = &pQueue->items[0];
for (int32_t i = 1; i < arrlen(pQueue->items); i++) {
DsPriorityItem* item = &pQueue->items[i];
if (item->depth > maxDepth) {
maxDepth = (GMLReal) item->depth;
if (item->depth >= maxDepth) { // greater-or-equal: newest item wins ties
maxDepth = item->depth;
maxNode = item;
}
}
Expand All @@ -5952,7 +5970,7 @@ static RValue builtin_ds_priority_write(VMContext* ctx, RValue* args, MAYBE_UNUS
RValue* valArr = (RValue*) safeMalloc((size_t) len * sizeof(RValue));

repeat(len, i) {
priArr[i] = RValue_makeReal((double) q->items[i].depth);
priArr[i] = RValue_makeReal(q->items[i].depth);
valArr[i] = q->items[i].item;
}

Expand Down Expand Up @@ -6014,7 +6032,7 @@ static RValue builtin_ds_priority_read(VMContext* ctx, RValue* args, MAYBE_UNUSE
return RValue_makeBool(false);
}

int32_t* tempPri = (int32_t*) safeMalloc((size_t) len * sizeof(int32_t));
GMLReal* tempPri = (GMLReal*) safeMalloc((size_t) len * sizeof(GMLReal));
RValue* tempVal = (RValue*) safeMalloc((size_t) len * sizeof(RValue));

repeat(len, i) {
Expand All @@ -6026,7 +6044,7 @@ static RValue builtin_ds_priority_read(VMContext* ctx, RValue* args, MAYBE_UNUSE
free(bytes);
return RValue_makeBool(false);
}
tempPri[i] = RValue_toInt32(p);
tempPri[i] = RValue_toReal(p);
RValue_free(&p);
}

Expand Down
Loading