AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix config strings, alternative config_t UB fix (#2166)

Browse Source
This commit is contained in:
Roman Fomin 2025-01-29 01:28:20 +07:00 committed by GitHub
parent 9a889301e0
commit d8e40de9a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 78 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/m_config.c
View File

@ -80,8 +80,8 @@ void M_BindNum(const char *name, void *location, void *current,
ss_types screen, wad_allowed_t wad, ss_types screen, wad_allowed_t wad,
const char *help) const char *help)
{ {
default_t item = { name, location, current, default_t item = { name, {.i = location}, {.i = current},
{.i = default_val}, {min_val, max_val}, {.number = default_val}, {min_val, max_val},
number, screen, wad, help }; number, screen, wad, help };
array_push(defaults, item); array_push(defaults, item);
} }
@ -94,17 +94,17 @@ void M_BindBool(const char *name, boolean *location, boolean *current,
screen, wad, help); screen, wad, help);
} }
void M_BindStr(char *name, const char **location, char *default_val, void M_BindStr(char *name, const char **location, const char *default_val,
wad_allowed_t wad, const char *help) wad_allowed_t wad, const char *help)
{ {
default_t item = { name, location, NULL, {.s = default_val}, default_t item = { name, {.s = (char **)location}, {0}, {.string = default_val},
{0}, string, ss_none, wad, help }; {0}, string, ss_none, wad, help };
array_push(defaults, item); array_push(defaults, item);
} }
void M_BindInput(const char *name, int input_id, const char *help) void M_BindInput(const char *name, int input_id, const char *help)
{ {
default_t item = { name, NULL, NULL, {0}, {UL,UL}, input, ss_keys, wad_no, default_t item = { name, {0}, {0}, {0}, {UL,UL}, input, ss_keys, wad_no,
help, input_id }; help, input_id };
array_push(defaults, item); array_push(defaults, item);
} }
@ -274,17 +274,17 @@ void M_SaveDefaults(void)
if (config_help) if (config_help)
{ {
if ((dp->type == string if ((dp->type == string
? fprintf(f, "[(\"%s\")]", (char *)dp->defaultvalue.s) ? fprintf(f, "[(\"%s\")]", (char *)dp->defaultvalue.string)
: dp->limit.min == UL : dp->limit.min == UL
? dp->limit.max == UL ? dp->limit.max == UL
? fprintf(f, "[?-?(%d)]", dp->defaultvalue.i) ? fprintf(f, "[?-?(%d)]", dp->defaultvalue.number)
: fprintf(f, "[?-%d(%d)]", dp->limit.max, : fprintf(f, "[?-%d(%d)]", dp->limit.max,
dp->defaultvalue.i) dp->defaultvalue.number)
: dp->limit.max == UL : dp->limit.max == UL
? fprintf(f, "[%d-?(%d)]", dp->limit.min, ? fprintf(f, "[%d-?(%d)]", dp->limit.min,
dp->defaultvalue.i) dp->defaultvalue.number)
: fprintf(f, "[%d-%d(%d)]", dp->limit.min, dp->limit.max, : fprintf(f, "[%d-%d(%d)]", dp->limit.min, dp->limit.max,
dp->defaultvalue.i)) dp->defaultvalue.number))
== EOF == EOF
|| fprintf(f, " %s %s\n", dp->help, dp->wad_allowed ? "*" : "") || fprintf(f, " %s %s\n", dp->help, dp->wad_allowed ? "*" : "")
== EOF) == EOF)
@ -298,17 +298,17 @@ void M_SaveDefaults(void)
if (dp->type == string) if (dp->type == string)
{ {
value.s = dp->modified ? dp->orig_default.s : dp->location; value.string = dp->modified ? dp->orig_default.string : *dp->location.s;
} }
else if (dp->type == number) else if (dp->type == number)
{ {
if (dp->modified) if (dp->modified)
{ {
value.i = dp->orig_default.i; value.number = dp->orig_default.number;
} }
else else
{ {
memcpy(&value.i, dp->location, sizeof(int)); value.number = *dp->location.i;
} }
} }
@ -319,8 +319,8 @@ void M_SaveDefaults(void)
if (dp->type != input) if (dp->type != input)
{ {
if (dp->type == number if (dp->type == number
? fprintf(f, "%-*s %i\n", maxlen, dp->name, value.i) == EOF ? fprintf(f, "%-*s %i\n", maxlen, dp->name, value.number) == EOF
: fprintf(f, "%-*s \"%s\"\n", maxlen, dp->name, value.s) : fprintf(f, "%-*s \"%s\"\n", maxlen, dp->name, value.string)
== EOF) == EOF)
{ {
goto error; goto error;
@ -491,19 +491,19 @@ boolean M_ParseOption(const char *p, boolean wad)
if (wad && !dp->modified) // Modified by wad if (wad && !dp->modified) // Modified by wad
{ // First time modified { // First time modified
dp->modified = 1; // Mark it as modified dp->modified = 1; // Mark it as modified
dp->orig_default.s = dp->location; // Save original default dp->orig_default.string = *dp->location.s; // Save original default
} }
else else
{ {
free(dp->location); // Free old value free(*dp->location.s); // Free old value
} }
dp->location = strdup(strparm + 1); // Change default value *dp->location.s = strdup(strparm + 1); // Change default value
if (dp->current) // Current value if (dp->current.s) // Current value
{ {
free(dp->current); // Free old value free(*dp->current.s); // Free old value
dp->current = strdup(strparm + 1); // Change current value *dp->current.s = strdup(strparm + 1); // Change current value
} }
} }
else if (dp->type == number) else if (dp->type == number)
@ -523,14 +523,14 @@ boolean M_ParseOption(const char *p, boolean wad)
{ {
dp->modified = 1; // Mark it as modified dp->modified = 1; // Mark it as modified
// Save original default // Save original default
memcpy(&dp->orig_default.i, dp->location, sizeof(int)); dp->orig_default.number = *dp->location.i;
} }
if (dp->current) // Change current value if (dp->current.i) // Change current value
{ {
memcpy(dp->current, &parm, sizeof(int)); *dp->current.i = parm;
} }
} }
memcpy(dp->location, &parm, sizeof(int)); // Change default *dp->location.i = parm; // Change default
} }
} }
else if (dp->type == input) else if (dp->type == input)
@ -669,11 +669,11 @@ void M_LoadDefaults(void)
{ {
if (dp->type == string) if (dp->type == string)
{ {
dp->location = strdup(dp->defaultvalue.s); *dp->location.s = strdup(dp->defaultvalue.string);
} }
else if (dp->type == number) else if (dp->type == number)
{ {
memcpy(dp->location, &dp->defaultvalue.i, sizeof(int)); *dp->location.i = dp->defaultvalue.number;
} }
else if (dp->type == input) else if (dp->type == input)
{ {

2
src/m_config.h
View File

@ -64,7 +64,7 @@ void M_BindBool(const char *name, boolean *location, boolean *current,
#define BIND_BOOL_MUSIC(name, v, help) \ #define BIND_BOOL_MUSIC(name, v, help) \
M_BindBool(#name, &name, NULL, (v), ss_music, wad_no, help) M_BindBool(#name, &name, NULL, (v), ss_music, wad_no, help)
void M_BindStr(char *name, const char **location, char *default_val, void M_BindStr(char *name, const char **location, const char *default_val,
wad_allowed_t wad, const char *help); wad_allowed_t wad, const char *help);
void M_BindInput(const char *name, int input_id, const char *help); void M_BindInput(const char *name, int input_id, const char *help);

10
src/mn_internal.h
View File

@ -221,15 +221,17 @@ typedef struct setup_menu_s
typedef union typedef union
{ {
char *s; char **s;
int i; int *i;
const char *string;
int number;
} config_t; } config_t;
typedef struct default_s typedef struct default_s
{ {
const char *name; // name const char *name; // name
void *location; // default variable config_t location; // default variable
void *current; // possible nondefault variable config_t current; // possible nondefault variable
config_t defaultvalue; // built-in default value config_t defaultvalue; // built-in default value
struct struct

108
src/mn_setup.c
View File

@ -394,8 +394,7 @@ static boolean ItemSelected(setup_menu_t *s)
static boolean PrevItemAvailable(setup_menu_t *s) static boolean PrevItemAvailable(setup_menu_t *s)
{ {
int value; int value = *s->var.def->location.i;
memcpy(&value, s->var.def->location, sizeof(int));
int min = s->var.def->limit.min; int min = s->var.def->limit.min;
return value > min; return value > min;
@ -403,8 +402,7 @@ static boolean PrevItemAvailable(setup_menu_t *s)
static boolean NextItemAvailable(setup_menu_t *s) static boolean NextItemAvailable(setup_menu_t *s)
{ {
int value; int value = *s->var.def->location.i;
memcpy(&value, s->var.def->location, sizeof(int));
int max = s->var.def->limit.max; int max = s->var.def->limit.max;
if (max == UL) if (max == UL)
@ -810,8 +808,7 @@ static void DrawSetting(setup_menu_t *s, int accum_y)
if (flags & S_ONOFF) if (flags & S_ONOFF)
{ {
int value; int value = *s->var.def->location.i;
memcpy(&value, s->var.def->location, sizeof(int));
strcpy(menu_buffer, value ? "ON" : "OFF"); strcpy(menu_buffer, value ? "ON" : "OFF");
BlinkingArrowRight(s); BlinkingArrowRight(s);
DrawMenuStringEx(flags, x, y, color); DrawMenuStringEx(flags, x, y, color);
@ -830,8 +827,7 @@ static void DrawSetting(setup_menu_t *s, int accum_y)
} }
else else
{ {
int value; int value = *s->var.def->location.i;
memcpy(&value, s->var.def->location, sizeof(int));
if (flags & S_PCT) if (flags & S_PCT)
{ {
M_snprintf(menu_buffer, sizeof(menu_buffer), "%d%%", value); M_snprintf(menu_buffer, sizeof(menu_buffer), "%d%%", value);
@ -913,8 +909,7 @@ static void DrawSetting(setup_menu_t *s, int accum_y)
if (flags & S_WEAP) // weapon number if (flags & S_WEAP) // weapon number
{ {
int value; int value = *s->var.def->location.i;
memcpy(&value, s->var.def->location, sizeof(int));
sprintf(menu_buffer, "%d", value); sprintf(menu_buffer, "%d", value);
BlinkingArrowRight(s); BlinkingArrowRight(s);
DrawMenuStringEx(flags, x, y, color); DrawMenuStringEx(flags, x, y, color);
@ -925,8 +920,7 @@ static void DrawSetting(setup_menu_t *s, int accum_y)
if (flags & (S_CHOICE | S_CRITEM)) if (flags & (S_CHOICE | S_CRITEM))
{ {
int i; int i = *s->var.def->location.i;
memcpy(&i, s->var.def->location, sizeof(int));
const char **strings = GetStrings(s->strings_id); const char **strings = GetStrings(s->strings_id);
menu_buffer[0] = '\0'; menu_buffer[0] = '\0';
@ -949,8 +943,7 @@ static void DrawSetting(setup_menu_t *s, int accum_y)
if (flags & S_THERMO) if (flags & S_THERMO)
{ {
int value; int value = *s->var.def->location.i;
memcpy(&value, s->var.def->location, sizeof(int));
int min = s->var.def->limit.min; int min = s->var.def->limit.min;
int max = s->var.def->limit.max; int max = s->var.def->limit.max;
const char **strings = GetStrings(s->strings_id); const char **strings = GetStrings(s->strings_id);
@ -3532,28 +3525,25 @@ static void ResetDefaults(ss_types reset_screen)
{ {
if (dp->type == string) if (dp->type == string)
{ {
free(dp->location); free(*dp->location.s);
dp->location = strdup(dp->defaultvalue.s); *dp->location.s = strdup(dp->defaultvalue.string);
} }
else if (dp->type == number) else if (dp->type == number)
{ {
memcpy(dp->location, &dp->defaultvalue.i, sizeof(int)); *dp->location.i = dp->defaultvalue.number;
} }
if (flags & (S_LEVWARN | S_PRGWARN)) if (flags & (S_LEVWARN | S_PRGWARN))
{ {
warn |= flags & (S_LEVWARN | S_PRGWARN); warn |= flags & (S_LEVWARN | S_PRGWARN);
} }
else if (dp->current) else if (dp->current.s)
{ {
if (dp->type == string) *dp->current.s = *dp->location.s;
{ }
dp->current = dp->location; else if (dp->current.i)
} {
else if (dp->type == number) *dp->current.i = *dp->location.i;
{
memcpy(dp->current, dp->location, sizeof(int));
}
} }
if (current_item->action) if (current_item->action)
@ -3886,10 +3876,9 @@ static void OnOff(void)
default_t *def = current_item->var.def; default_t *def = current_item->var.def;
// def->location->i = !def->location->i; // killough 8/15/98 // def->location->i = !def->location->i; // killough 8/15/98
int value; int value = *def->location.i;
memcpy(&value, def->location, sizeof(int));
value = !value; value = !value;
memcpy(def->location, &value, sizeof(int)); *def->location.i = value;
// killough 8/15/98: add warning messages // killough 8/15/98: add warning messages
@ -3897,9 +3886,9 @@ static void OnOff(void)
{ {
warn_about_changes(flags); warn_about_changes(flags);
} }
else if (def->current) else if (def->current.i)
{ {
memcpy(def->current, def->location, sizeof(int)); *def->current.i = *def->location.i;
} }
if (current_item->action) // killough 10/98 if (current_item->action) // killough 10/98
@ -3913,9 +3902,7 @@ static void Choice(menu_action_t action)
setup_menu_t *current_item = current_menu + set_item_on; setup_menu_t *current_item = current_menu + set_item_on;
int flags = current_item->m_flags; int flags = current_item->m_flags;
default_t *def = current_item->var.def; default_t *def = current_item->var.def;
int location; int value = *def->location.i;
memcpy(&location, def->location, sizeof(int));
int value = location;
if (flags & S_ACTION && setup_cancel == -1) if (flags & S_ACTION && setup_cancel == -1)
{ {
@ -3931,11 +3918,11 @@ static void Choice(menu_action_t action)
value = def->limit.min; value = def->limit.min;
} }
if (location != value) if (*def->location.i != value)
{ {
M_StartSound(sfx_stnmov); M_StartSound(sfx_stnmov);
} }
memcpy(def->location, &value, sizeof(int)); *def->location.i = value;
if (!(flags & S_ACTION) && current_item->action) if (!(flags & S_ACTION) && current_item->action)
{ {
@ -3962,11 +3949,11 @@ static void Choice(menu_action_t action)
value = max; value = max;
} }
if (location != value) if (*def->location.i != value)
{ {
M_StartSound(sfx_stnmov); M_StartSound(sfx_stnmov);
} }
memcpy(def->location, &value, sizeof(int)); *def->location.i = value;
if (!(flags & S_ACTION) && current_item->action) if (!(flags & S_ACTION) && current_item->action)
{ {
@ -3980,9 +3967,9 @@ static void Choice(menu_action_t action)
{ {
warn_about_changes(flags); warn_about_changes(flags);
} }
else if (def->current) else if (def->current.i)
{ {
memcpy(def->current, def->location, sizeof(int)); *def->current.i = *def->location.i;
} }
if (current_item->action) if (current_item->action)
@ -4010,7 +3997,7 @@ static boolean ChangeEntry(menu_action_t action, int ch)
{ {
if (flags & (S_CHOICE | S_CRITEM | S_THERMO) && setup_cancel != -1) if (flags & (S_CHOICE | S_CRITEM | S_THERMO) && setup_cancel != -1)
{ {
memcpy(def->location, &setup_cancel, sizeof(int)); *def->location.i = setup_cancel;
setup_cancel = -1; setup_cancel = -1;
} }
@ -4072,7 +4059,7 @@ static boolean ChangeEntry(menu_action_t action, int ch)
value = BETWEEN(min, max, value); value = BETWEEN(min, max, value);
} }
memcpy(def->location, &value, sizeof(int)); *def->location.i = value;
// killough 8/9/98: fix numeric vars // killough 8/9/98: fix numeric vars
// killough 8/15/98: add warning message // killough 8/15/98: add warning message
@ -4081,9 +4068,9 @@ static boolean ChangeEntry(menu_action_t action, int ch)
{ {
warn_about_changes(flags); warn_about_changes(flags);
} }
else if (def->current) else if (def->current.i)
{ {
memcpy(def->current, &value, sizeof(int)); *def->current.i = value;
} }
if (current_item->action) // killough 10/98 if (current_item->action) // killough 10/98
@ -4340,19 +4327,17 @@ boolean MN_SetupResponder(menu_action_t action, int ch)
setup_menu_t *p = weap_settings[i]; setup_menu_t *p = weap_settings[i];
for (; !(p->m_flags & S_END); p++) for (; !(p->m_flags & S_END); p++)
{ {
int location; if (p->m_flags & S_WEAP
memcpy(&location, p->var.def->location, sizeof(int)); && *p->var.def->location.i == ch
if (p->m_flags & S_WEAP && location == ch
&& p != current_item) && p != current_item)
{ {
memcpy(p->var.def->location, *p->var.def->location.i = *current_item->var.def->location.i;
current_item->var.def->location, sizeof(int));
goto end; goto end;
} }
} }
} }
end: end:
memcpy(current_item->var.def->location, &ch, sizeof(int)); *current_item->var.def->location.i = ch;
} }
SelectDone(current_item); // phares 4/17/98 SelectDone(current_item); // phares 4/17/98
@ -4566,9 +4551,9 @@ boolean MN_SetupMouseResponder(int x, int y)
{ {
warn_about_changes(flags); warn_about_changes(flags);
} }
else if (def->current) else if (def->current.i)
{ {
memcpy(def->current, def->location, sizeof(int)); *def->current.i = *def->location.i;
} }
if (active_thermo->action) if (active_thermo->action)
@ -4635,12 +4620,10 @@ boolean MN_SetupMouseResponder(int x, int y)
int step = (max - min) * FRACUNIT / (rect->w - M_THRM_STEP * 2); int step = (max - min) * FRACUNIT / (rect->w - M_THRM_STEP * 2);
int value = dot * step / FRACUNIT + min; int value = dot * step / FRACUNIT + min;
value = BETWEEN(min, max, value); value = BETWEEN(min, max, value);
int location;
memcpy(&location, def->location, sizeof(int));
if (value != location) if (value != *def->location.i)
{ {
memcpy(def->location, &value, sizeof(int)); *def->location.i = value;
if (!(flags & S_ACTION) && active_thermo->action) if (!(flags & S_ACTION) && active_thermo->action)
{ {
@ -4666,10 +4649,7 @@ boolean MN_SetupMouseResponder(int x, int y)
if (flags & (S_CRITEM | S_CHOICE)) if (flags & (S_CRITEM | S_CHOICE))
{ {
default_t *def = current_item->var.def; default_t *def = current_item->var.def;
int value = *def->location.i;
int location;
memcpy(&location, def->location, sizeof(int));
int value = location;
if (NextItemAvailable(current_item)) if (NextItemAvailable(current_item))
{ {
@ -4680,11 +4660,11 @@ boolean MN_SetupMouseResponder(int x, int y)
value = def->limit.min; value = def->limit.min;
} }
if (location != value) if (*def->location.i != value)
{ {
M_StartSound(sfx_stnmov); M_StartSound(sfx_stnmov);
} }
memcpy(def->location, &value, sizeof(int)); *def->location.i = value;
if (current_item->action) if (current_item->action)
{ {
@ -4695,9 +4675,9 @@ boolean MN_SetupMouseResponder(int x, int y)
{ {
warn_about_changes(flags); warn_about_changes(flags);
} }
else if (def->current) else if (def->current.i)
{ {
memcpy(def->current, def->location, sizeof(int)); *def->current.i = *def->location.i;
} }
return true; return true;