diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-07-26 08:29:05 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-07-26 08:29:05 -0600 |
| commit | 7c946bfafe961c1dda51d19b5c29a5600ef1e5ec (patch) | |
| tree | 608ff1bdeafce3223747418560cb39e045a5683f /alpine/smime.c | |
| parent | 9306e227fc7b1b096d4a58f8c06da66603a50a6a (diff) | |
| download | alpine-7c946bfafe961c1dda51d19b5c29a5600ef1e5ec.tar.xz | |
* Fix compilation error in arg.c when pwdcertdir was being freed, even
though a password file might have not been defined.
* Work on reducing the number of warnings in OSX.
Diffstat (limited to 'alpine/smime.c')
| -rw-r--r-- | alpine/smime.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/alpine/smime.c b/alpine/smime.c index ca18b3ee..8949487e 100644 --- a/alpine/smime.c +++ b/alpine/smime.c @@ -62,6 +62,7 @@ void smime_manage_certs_init (struct pine *, CONF_S **, CONF_S **, WhichCert void display_certificate_information(struct pine *, X509 *, char *, WhichCerts, int num); int manage_certs_tool(struct pine *ps, int cmd, CONF_S **cl, unsigned flags); int manage_certificate_info_tool(int, MSGNO_S *, SCROLL_S *); +void smime_setup_size(char **, size_t, size_t); /* @@ -1324,13 +1325,14 @@ manage_certs_tool(struct pine *ps, int cmd, CONF_S **cl, unsigned flags) } void -smime_setup_size(char **s, size_t n) +smime_setup_size(char **s, size_t buflen, size_t n) { char *t = *s; *t++ = ' '; *t++ = '%'; *t++ = '-'; - sprintf(t+strlen(t), "%d.%d", n, n); + snprintf(t+strlen(t), buflen-3, "%zu.%zu", n, n); + t[strlen(t)-1] = '\0'; t += strlen(t); *t++ = 's'; *t++ = ' '; @@ -1395,11 +1397,11 @@ void smime_manage_certs_init(struct pine *ps, CONF_S **ctmp, CONF_S **first_line memset(u, '\0', sizeof(u)); t = u; - smime_setup_size(&t, s); - smime_setup_size(&t, e); - smime_setup_size(&t, df); - smime_setup_size(&t, dt); - smime_setup_size(&t, md5); + smime_setup_size(&t, sizeof(u), s); + smime_setup_size(&t, sizeof(u) - strlen(t), e); + smime_setup_size(&t, sizeof(u) - strlen(t), df); + smime_setup_size(&t, sizeof(u) - strlen(t), dt); + smime_setup_size(&t, sizeof(u) - strlen(t), md5); for(cl = data, i = 0; cl; cl = cl->next) if(cl->name){ |