mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-15 19:19:58 -04:00
153295b64c
cfg.c default_number, which cfg_int and cfg_double use for a set value that does not parse, read cfg_meta(name)->def without a check, so a key without a row whose value was set and unparsable crashed there (the verifier's probe: a segmentation fault inside default_number). gfx_present.c gfx_cfg_window_size did the same for WINDOW_SIZE. Neither is reachable today: every unguarded value read has a row (tests/cfg_rows_check.py holds it so), the three guarded ones use cfg_bool, and WINDOW_SIZE has a row. default_number gives 0 for a key without a row; gfx_cfg_window_size falls back to 1920x1080 when the row or its default is missing. Taking the device profile's default there (1280x800 on a Steam Deck) would change what players get and is left for approval. Reproduced before the change with the new case in tests/cfg_parse_check.py (cfg_int and cfg_double of an unset row's key set to "abc" crashed the program); with the change both give 0 and the check passes, as do the cfg rows checks and the compile checks. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
91 lines
3.4 KiB
C
91 lines
3.4 KiB
C
// runtime/cfg.c's reading of nx2navi.ini and the environment, with stand-ins for what cfg.c links against. Built and
|
|
// run by tests/cfg_parse_check.py: `cfg_parse_check <case> <ini>` loads the file the script wrote and prints every line
|
|
// cfg.c logged ("log: ...") and what the case reads back ("got: ...").
|
|
// load cfg_load on the file; then cfg_init's check of the environment (the variables the script set)
|
|
// full cfg_load on the file, then two cfg_set of keys the file does not have
|
|
// norow cfg_int and cfg_double of a key without a row whose value (the environment's) does not parse
|
|
#include <stdarg.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "cfg.h"
|
|
#include "host.h"
|
|
#include "platform/platform.h"
|
|
|
|
void rt_log(const char *fmt, ...) {
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
printf("log: ");
|
|
vprintf(fmt, ap);
|
|
printf("\n");
|
|
va_end(ap);
|
|
}
|
|
void rt_fatal(const char *fmt, ...) {
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
printf("FATAL: ");
|
|
vprintf(fmt, ap);
|
|
printf("\n");
|
|
va_end(ap);
|
|
exit(3);
|
|
}
|
|
const char *bugcap_replay_dir(void) { return NULL; }
|
|
void perf_size(PerfSizes *s, const char *name, uint64_t count, uint64_t limit, uint64_t bytes) {
|
|
(void)s, (void)name, (void)count, (void)limit, (void)bytes;
|
|
}
|
|
static const char *ini;
|
|
int plat_exe_path(char *out, size_t n) { (void)out, (void)n; return 0; }
|
|
int plat_file_exists(const char *p) {
|
|
FILE *f = fopen(p, "rb");
|
|
if (f) fclose(f);
|
|
return f != NULL;
|
|
}
|
|
uint8_t *plat_file_read(const char *path, uint64_t *size) {
|
|
FILE *f = fopen(path, "rb");
|
|
if (!f) return NULL;
|
|
fseek(f, 0, SEEK_END);
|
|
long n = ftell(f);
|
|
fseek(f, 0, SEEK_SET);
|
|
uint8_t *d = malloc((size_t)n + 1);
|
|
if (fread(d, 1, (size_t)n, f) != (size_t)n) n = 0;
|
|
d[n] = 0;
|
|
fclose(f);
|
|
*size = (uint64_t)n;
|
|
return d;
|
|
}
|
|
int64_t plat_file_size(const char *p) { (void)p; return -1; }
|
|
int plat_file_write_atomic(const char *p, const void *d, size_t n) { (void)p, (void)d, (void)n; return 1; }
|
|
void plat_mutex_lock(PlatMutex *m) { (void)m; }
|
|
void plat_mutex_unlock(PlatMutex *m) { (void)m; }
|
|
int plat_setenv(const char *n, const char *v) { (void)n, (void)v; return 1; }
|
|
|
|
int main(int argc, char **argv) {
|
|
setvbuf(stdout, NULL, _IONBF, 0);
|
|
if (argc < 3) return 2;
|
|
ini = argv[2];
|
|
if (!strcmp(argv[1], "load")) {
|
|
if (!cfg_load(ini)) return printf("cfg_load failed\n"), 2;
|
|
printf("got: pace_smooth '%s'\n", cfg_get("NX2NAVI_PACE_SMOOTH") ? cfg_get("NX2NAVI_PACE_SMOOTH") : "(unset)");
|
|
printf("--- environment\n");
|
|
cfg_init(); // finds no nx2navi.ini next to the stand-in exe; checks the environment's values
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[1], "full")) {
|
|
if (!cfg_load(ini)) return printf("cfg_load failed\n"), 2;
|
|
const char *ll = cfg_get("NX2NAVI_LOW_LATENCY");
|
|
printf("got: low_latency %s\n", ll ? ll : "(unset)");
|
|
cfg_set("NX2NAVI_VK_PRESENT", "fifo");
|
|
cfg_set("NX2NAVI_FULLSCREEN", "1");
|
|
printf("got: vk_present %s\n", cfg_get("NX2NAVI_VK_PRESENT") ? cfg_get("NX2NAVI_VK_PRESENT") : "(unset)");
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[1], "norow")) {
|
|
if (!cfg_load(ini)) return printf("cfg_load failed\n"), 2;
|
|
printf("got: cfg_int %d cfg_double %g\n", cfg_int("NX2NAVI_NO_ROW_CHECK"), cfg_double("NX2NAVI_NO_ROW_CHECK"));
|
|
return 0;
|
|
}
|
|
return 2;
|
|
}
|