diff options
author | Eduardo Chappa <chappa@washington.edu> | 2014-04-25 17:31:25 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2014-04-25 17:31:25 -0600 |
commit | e797af007ccac26651f003bcead095f79994d5a0 (patch) | |
tree | b291d66106dcbfba990b6a8f4f9d0986fb76abe1 /pith/string.c | |
parent | 06525250787f8f774afa7f25901a8a805f2a29db (diff) | |
download | alpine-e797af007ccac26651f003bcead095f79994d5a0.tar.xz |
* When downloading a signed message, and processing it, we use
body->nested.part instead of b->nested.part in the
do_detached_signature_verify function, and save its body and mime
headers in create_local_cache. Now all signed messages should
verify correctly.
* Protect against potential crash bug in write_passfile function by
checking if text != NULL. text can only be null if there are no
passwords to save. We assume we could get write_passfile called
with null arguments, so this is just to protect that.
* Add handling of corner cases to several functions by initializing some
variables. Reported and patched by James Jerkins.
* When selecting the certificate/key pair to encrypt/decrypt the password
file choose it in this order:
- if -pwdcertdir is given look for certificates there, if nothing
there, we bail out;
- otherwise we look in the default directory, if anything there
and it matches to be a key/cert pair, we use it;
- otherwise we check if smime_init() has been called. If not
we call it;
- we check if a key/cert pair has been found with smime initialized,
if so, use it and copy it to the default directory;
- if not, check if there is anything in the default smime directories
(.alpine-smime/private and .alpine-smime/public), and in this
case copy it to the default.
- otherwise we bail. We will eventually create a certificate/key
pair for the user;
- finally, if we called smime_init(), we call smime_deinit().
Throughout this process, if smime_init() was not called before
we tried to get the cert/key pair we exit this process without
ps_global->smime->inited set, so that other process that need
to call smime_init() get the right structure initialized. This is
done because we might pick a cert/key pair to decrypt the password
file.
Diffstat (limited to 'pith/string.c')
-rw-r--r-- | pith/string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pith/string.c b/pith/string.c index e23b704f..6ad1045a 100644 --- a/pith/string.c +++ b/pith/string.c @@ -431,7 +431,7 @@ short_str(char *src, char *buf, size_t buflen, int wid, WhereDots where) } q = buf; - if(first){ + if(first > 0){ q += utf8_to_width(q, src, buflen, first, &got_width); if(got_width != first){ if(second) @@ -448,7 +448,7 @@ short_str(char *src, char *buf, size_t buflen, int wid, WhereDots where) q += strlen(q); } - if(second){ + if(second > 0){ char *p; p = utf8_count_back_width(src, src+strlen(src), second, &got_width); @@ -2738,7 +2738,7 @@ add_escapes(char *src, char *quote_these_chars, int quoting_char, char * copy_quoted_string_asis(char *src) { - char *q, *p; + char *q = NULL, *p; int done = 0, quotes = 0; if(src){ |