Merge with sync sequoia_windows
authorThomas
Thu, 18 Jul 2019 14:24:09 +0200
branchsequoia_windows
changeset 393488d7900fa705
parent 3925 6aae202ba5f1
parent 3932 c487731d164d
child 3937 8889abf6d2da
Merge with sync
sync/sync.fsm
     1.1 --- a/src/keymanagement.c	Mon Jul 15 13:07:50 2019 +0200
     1.2 +++ b/src/keymanagement.c	Thu Jul 18 14:24:09 2019 +0200
     1.3 @@ -249,7 +249,7 @@
     1.4          case PEP_ct_key_revoked:
     1.5          case PEP_ct_key_b0rken:
     1.6              // delete key from being default key for all users/identities
     1.7 -            status = remove_fpr_as_default(session, fpr); //BUFF: considers the key as "revoked" ...
     1.8 +            status = remove_fpr_as_default(session, fpr);
     1.9              status = update_trust_for_fpr(session, 
    1.10                                            fpr, 
    1.11                                            ct);
    1.12 @@ -257,7 +257,7 @@
    1.13              free(ident->fpr);
    1.14              ident->fpr = NULL;
    1.15              ident->comm_type = ct;            
    1.16 -            status = PEP_KEY_UNSUITABLE; //BUFF: ... and returns PEP_KEY_UNSUITABLE
    1.17 +            status = PEP_KEY_UNSUITABLE;
    1.18          default:
    1.19              break;
    1.20      }            
     2.1 --- a/src/message_api.c	Mon Jul 15 13:07:50 2019 +0200
     2.2 +++ b/src/message_api.c	Thu Jul 18 14:24:09 2019 +0200
     2.3 @@ -2604,8 +2604,8 @@
     2.4      
     2.5      if ((!slong || slong[0] == '\0')
     2.6           && (!sform || sform[0] == '\0')) {
     2.7 -        if (satt) {
     2.8 -            const char* inner_mime_type = satt->mime_type;
     2.9 +        const char* inner_mime_type = (satt ? satt->mime_type : NULL);     
    2.10 +        if (inner_mime_type) {
    2.11              if (strcasecmp(inner_mime_type, "text/plain") == 0) {
    2.12                  free(slong); /* in case of "" */
    2.13                  src->longmsg = strndup(satt->value, satt->size);