projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a missing initialisation to NULL.
[u/mdw/putty]
/
settings.c
diff --git
a/settings.c
b/settings.c
index
934f186
..
af5a1b2
100644
(file)
--- a/
settings.c
+++ b/
settings.c
@@
-382,11
+382,11
@@
static void wprefs(void *sesskey, char *name,
const char *s = val2key(mapping, nvals,
conf_get_int_int(conf, primary, i));
if (s) {
const char *s = val2key(mapping, nvals,
conf_get_int_int(conf, primary, i));
if (s) {
- maxlen +=
1
+ strlen(s);
+ maxlen +=
(maxlen > 0 ? 1 : 0)
+ strlen(s);
}
}
}
}
- buf = snewn(maxlen, char);
+ buf = snewn(maxlen
+ 1
, char);
p = buf;
for (i = 0; i < nvals; i++) {
p = buf;
for (i = 0; i < nvals; i++) {
@@
-397,7
+397,8
@@
static void wprefs(void *sesskey, char *name,
}
}
}
}
- assert(p - buf == maxlen - 1); /* maxlen counted the NUL */
+ assert(p - buf == maxlen);
+ *p = '\0';
write_setting_s(sesskey, name, buf);
write_setting_s(sesskey, name, buf);