mirror of
https://github.com/tbamud/tbamud.git
synced 2026-04-30 04:41:51 +02:00
Compare commits
2 Commits
copilot/fi
...
copilot/fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed5f6a81da | ||
|
|
a2e3c2481d |
@@ -415,7 +415,7 @@ void copyover_recover()
|
||||
|
||||
for (;;) {
|
||||
fOld = TRUE;
|
||||
if (fscanf(fp, "%d %ld %511s %1023s %1023s\n", &desc, &pref, name, host, guiopt) != 5) {
|
||||
if (fscanf(fp, "%d %ld %s %s %s\n", &desc, &pref, name, host, guiopt) != 5) {
|
||||
if(!feof(fp)) {
|
||||
if(ferror(fp))
|
||||
log("SYSERR: error reading copyover file %s: %s", COPYOVER_FILE, strerror(errno));
|
||||
|
||||
@@ -1636,6 +1636,13 @@ void var_subst(void *go, struct script_data *sc, trig_data *trig,
|
||||
int paren_count = 0;
|
||||
int dots = 0;
|
||||
|
||||
/* reject lines that would overflow our fixed-size buffers */
|
||||
if (strnlen(line, MAX_INPUT_LENGTH) >= MAX_INPUT_LENGTH) {
|
||||
script_log("Trigger VNum %d: variable substitution line too long, ignoring.", GET_TRIG_VNUM(trig));
|
||||
*buf = '\0';
|
||||
return;
|
||||
}
|
||||
|
||||
/* skip out if no %'s */
|
||||
if (!strchr(line, '%')) {
|
||||
strcpy(buf, line);
|
||||
|
||||
Reference in New Issue
Block a user