merge
authorKrista Bennett <krista@pep-project.org>
Mon, 22 Oct 2018 08:18:06 +0200
changeset 30954df9a15497c2
parent 3093 916946918d04
parent 3088 ed6200e57c65
child 3098 7d3a9eb26b28
child 3103 7a51a2b6c7ba
merge
     1.1 --- a/src/pgp_netpgp.c	Fri Oct 19 13:26:15 2018 +0200
     1.2 +++ b/src/pgp_netpgp.c	Mon Oct 22 08:18:06 2018 +0200
     1.3 @@ -1424,7 +1424,6 @@
     1.4          request[HKP_REQ_PREFIX_LEN + encoded_key_len] = '\0';
     1.5  
     1.6          if(!stringlist_add(encoded_keys, request)){
     1.7 -            free(request);
     1.8              result = PEP_OUT_OF_MEMORY;
     1.9          }
    1.10  
    1.11 @@ -1953,7 +1952,7 @@
    1.12          *has_private = true;
    1.13      }
    1.14      else {
    1.15 -        has_private = false;
    1.16 +        *has_private = false;
    1.17      }
    1.18      return status;
    1.19  }