merge default into my branch roker-linux
authorRoker <roker@pep-project.org>
Mon, 01 Aug 2016 17:00:55 +0200
branchroker-linux
changeset 96373886607a5a0
parent 950 79244fc25166
parent 962 aff7b6e41fde
child 988 c0da2fd9d2a5
merge default into my branch
     1.1 --- a/db/create_system_db.sql	Thu Jul 21 17:53:04 2016 +0200
     1.2 +++ b/db/create_system_db.sql	Mon Aug 01 17:00:55 2016 +0200
     1.3 @@ -42,6 +42,6 @@
     1.4  INSERT INTO i18n_token VALUES ('ca', 1000, 'Vull mostrar les trustwords en català');
     1.5  
     1.6  INSERT INTO i18n_language VALUES ('tr', 'Türkçe');
     1.7 -INSERT INTO i18n_token VALUES ('tr', 1000, 'Güvenlik kelimelerini Türk dilinde görüntülemek istiyorum.');
     1.8 +INSERT INTO i18n_token VALUES ('tr', 1000, 'Güvenlik kelimelerini Türk dilinde görüntülemek istiyorum');
     1.9  -- add more languages here
    1.10  
     2.1 --- a/src/message_api.c	Thu Jul 21 17:53:04 2016 +0200
     2.2 +++ b/src/message_api.c	Mon Aug 01 17:00:55 2016 +0200
     2.3 @@ -627,7 +627,7 @@
     2.4      case PEP_rating_b0rken:
     2.5          return "b0rken";
     2.6      case PEP_rating_under_attack:
     2.7 -        return "unter_attack";
     2.8 +        return "under_attack";
     2.9      default:
    2.10          return "undefined";
    2.11      }
    2.12 @@ -1598,8 +1598,8 @@
    2.13      if (!(session && msg && ident))
    2.14          return PEP_ILLEGAL_VALUE;
    2.15  
    2.16 -    message *dst; 
    2.17 -    stringlist_t *keylist;
    2.18 +    message *dst = NULL; 
    2.19 +    stringlist_t *keylist = NULL;
    2.20      PEP_color color;
    2.21      PEP_decrypt_flags_t flags; 
    2.22  
    2.23 @@ -1616,6 +1616,8 @@
    2.24      }
    2.25  
    2.26      free_identity_list(private_il);
    2.27 +    free_stringlist(keylist);
    2.28 +    free_message(dst);
    2.29  
    2.30      return status;
    2.31  
     3.1 --- a/src/pEpEngine.c	Thu Jul 21 17:53:04 2016 +0200
     3.2 +++ b/src/pEpEngine.c	Mon Aug 01 17:00:55 2016 +0200
     3.3 @@ -559,6 +559,18 @@
     3.4                  sqlite3_finalize(session->blacklist_is_listed);
     3.5              if (session->blacklist_retrieve)
     3.6                  sqlite3_finalize(session->blacklist_retrieve);
     3.7 +            if (session->own_key_is_listed)
     3.8 +                sqlite3_finalize(session->own_key_is_listed);
     3.9 +            if (session->own_key_retrieve)
    3.10 +                sqlite3_finalize(session->own_key_retrieve);
    3.11 +            if (session->sequence_value1)
    3.12 +                sqlite3_finalize(session->sequence_value1);
    3.13 +            if (session->sequence_value2)
    3.14 +                sqlite3_finalize(session->sequence_value2);
    3.15 +            if (session->set_revoked)
    3.16 +                sqlite3_finalize(session->set_revoked);
    3.17 +            if (session->get_revoked)
    3.18 +                sqlite3_finalize(session->get_revoked);
    3.19  
    3.20              if (session->db)
    3.21                  sqlite3_close_v2(session->db);