qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gamecode] Disconnect held strings from return slot

Browse source 
Fixes an internal string error when a return string has been freed.
This commit is contained in:
Bill Currie 2021-01-04 23:42:10 +09:00
parent bf62929f06
commit a88f821342
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/gamecode/pr_strings.c
View file

@ -344,7 +344,7 @@ get_string (progs_t *pr, string_t num)
case str_free: case str_free:
break; break;
} }
PR_Error (pr, "internal string error: %d", __LINE__); PR_Error (pr, "internal string error: line:%d", __LINE__);
} else { } else {
if (num >= pr->pr_stringsize) if (num >= pr->pr_stringsize)
return 0; return 0;
@ -469,17 +469,17 @@ PR_SetReturnString (progs_t *pr, const char *s)
requeue_strref (res, sr); requeue_strref (res, sr);
} else if ((sr->type == str_return && !sr->rs_slot) } else if ((sr->type == str_return && !sr->rs_slot)
|| (sr->type != str_return && sr->rs_slot)) { || (sr->type != str_return && sr->rs_slot)) {
PR_Error (pr, "internal string error: %d %d %p", __LINE__, PR_Error (pr, "internal string error: line:%d %d %p", __LINE__,
sr->type, sr->rs_slot); sr->type, sr->rs_slot);
} }
return string_index (res, sr); return string_index (res, sr);
} }
// grab the string ref from the oldest slot, or make a new one if the // grab the string ref from the oldest slot, or make a new one if the
// slot is empty or the string has been held // slot is empty
if ((sr = res->rs_slot->strref) && sr->type != str_dynamic) { if ((sr = res->rs_slot->strref)) {
if (sr->type != str_return || sr->rs_slot != res->rs_slot) { if (sr->type != str_return || sr->rs_slot != res->rs_slot) {
PR_Error (pr, "internal string error: %d", __LINE__); PR_Error (pr, "internal string error: line:%d", __LINE__);
} }
pr_strfree (pr, sr->s.string); pr_strfree (pr, sr->s.string);
} else { } else {
@ -629,7 +629,10 @@ PR_HoldString (progs_t *pr, string_t str)
if (sr) { if (sr) {
switch (sr->type) { switch (sr->type) {
case str_temp: case str_temp:
break;
case str_return: case str_return:
sr->rs_slot->strref = 0;
sr->rs_slot = 0;
break; break;
case str_static: case str_static:
case str_mutable: case str_mutable:
@ -637,7 +640,7 @@ PR_HoldString (progs_t *pr, string_t str)
// non-ephemeral string, no-op // non-ephemeral string, no-op
return; return;
default: default:
PR_Error (pr, "internal string error: %d", __LINE__); PR_Error (pr, "internal string error: line:%d", __LINE__);
} }
sr->type = str_dynamic; sr->type = str_dynamic;
return; return;
@ -666,7 +669,7 @@ PR_FreeString (progs_t *pr, string_t str)
pr_strfree (pr, sr->s.string); pr_strfree (pr, sr->s.string);
break; break;
default: default:
PR_Error (pr, "internal string error: %d", __LINE__); PR_Error (pr, "internal string error: line:%d", __LINE__);
} }
free_string_ref (res, sr); free_string_ref (res, sr);
return; return;
@ -690,7 +693,7 @@ PR_FreeTempStrings (progs_t *pr)
continue; continue;
} }
if (sr->type != str_temp) if (sr->type != str_temp)
PR_Error (pr, "internal string error: %d", __LINE__); PR_Error (pr, "internal string error: line:%d", __LINE__);
if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr) if (R_STRING (pr) < 0 && string_index (res, sr) == R_STRING (pr)
&& pr->pr_depth) { && pr->pr_depth) {
// It looks like the temp string is being returned. While this // It looks like the temp string is being returned. While this