merge default into my branch roker-linux
authorRoker <roker@pep-project.org>
Thu, 21 Jul 2016 15:16:23 +0200
branchroker-linux
changeset 9174d844c91fcf3
parent 916 b01eb9f041ff
parent 915 72fe8bd4ae5e
child 950 79244fc25166
merge default into my branch
     1.1 --- a/src/identity_list.c	Wed Jul 20 01:39:21 2016 +0200
     1.2 +++ b/src/identity_list.c	Thu Jul 21 15:16:23 2016 +0200
     1.3 @@ -29,8 +29,10 @@
     1.4          return NULL;
     1.5  
     1.6      identity_list *id_list = new_identity_list(_ident);
     1.7 -    if (id_list == NULL)
     1.8 +    if (id_list == NULL) {
     1.9 +        free_identity(_ident);
    1.10          return NULL;
    1.11 +    }
    1.12  
    1.13      identity_list* src_curr = src->next;
    1.14      identity_list** dst_curr_ptr = &id_list->next;
     2.1 --- a/src/pgp_gpg.c	Wed Jul 20 01:39:21 2016 +0200
     2.2 +++ b/src/pgp_gpg.c	Thu Jul 21 15:16:23 2016 +0200
     2.3 @@ -37,6 +37,9 @@
     2.4          assert(length == stringlist_length(values));
     2.5          if (!(length == stringlist_length(values) &&
     2.6                length <= sizeof(unsigned int) * CHAR_BIT)) {
     2.7 +            r = Fclose(f);
     2.8 +            assert(r == 0);
     2.9 +        
    2.10              return false;
    2.11          }
    2.12