merging sync
authorVolker Birk <vb@pep-project.org>
Wed, 29 May 2019 11:37:44 +0200
branchsync
changeset 37656e0ded701a54
parent 3764 86b50fe25671
parent 3763 2098edd0c4d7
child 3766 dffc8ed6625a
child 3767 11a9d0f61073
child 3803 26b82716fb60
merging
     1.1 --- a/src/pEpEngine.c	Wed May 29 11:37:30 2019 +0200
     1.2 +++ b/src/pEpEngine.c	Wed May 29 11:37:44 2019 +0200
     1.3 @@ -2403,7 +2403,7 @@
     1.4      )
     1.5  {
     1.6      PEP_STATUS status = PEP_STATUS_OK;
     1.7 -    static pEp_identity *_identity;
     1.8 +    pEp_identity *_identity = NULL;
     1.9  
    1.10      assert(session);
    1.11      assert(address);
    1.12 @@ -2614,7 +2614,7 @@
    1.13      )
    1.14  {
    1.15      PEP_STATUS status = PEP_STATUS_OK;
    1.16 -    static pEp_identity *_identity;
    1.17 +    pEp_identity *_identity = NULL;
    1.18  
    1.19      assert(session);
    1.20      assert(address);
    1.21 @@ -5084,4 +5084,3 @@
    1.22  #endif
    1.23      log_service(session, "### service error log ###", entity, buffer, where);
    1.24  }
    1.25 -
     2.1 --- a/test/src/engine_tests/URIAddressTests.cc	Wed May 29 11:37:30 2019 +0200
     2.2 +++ b/test/src/engine_tests/URIAddressTests.cc	Wed May 29 11:37:44 2019 +0200
     2.3 @@ -40,7 +40,9 @@
     2.4      status = export_key(session, me->fpr, 
     2.5                          &keydata, &keysize);
     2.6  
     2.7 -    cout << keydata << endl;
     2.8 +    TEST_ASSERT(keydata && keysize > 0);
     2.9 +    // no guarantee of NUL-termination atm.
    2.10 +//    cout << keydata << endl;
    2.11  
    2.12      free(keydata);
    2.13      free_identity(me);