Fixed double free and unprotected NULL dereferencing.

build-android/build.sh

@@ -7,7 +7,8 @@ ANDROID_PLATFORM=android-21
 openssl_build_version=1
 cyrus_sasl_build_version=1
 libetpan_build_version=1
-archs="armeabi armeabi-v7a x86 x86_64"
+# archs="armeabi armeabi-v7a x86 x86_64"
+archs="armeabi"
 package_name=pEpEngine-android
 
 current_dir="`pwd`"

src/keymanagement.c

@@ -235,7 +235,10 @@ DYNAMIC_API PEP_STATUS myself(PEP_SESSION session, pEp_identity * identity)
         if (status == PEP_OUT_OF_MEMORY)
             return PEP_OUT_OF_MEMORY;
 
-        assert(keylist);
+        assert(keylist || keylist->value);
+        if (keylist == NULL || keylist->value == NULL) {
+            return PEP_UNKNOWN_ERROR;
+        }
     }
     else {
         bool expired;

src/message_api.c

@@ -327,8 +327,10 @@ static PEP_STATUS encrypt_PGP_MIME(
     _src->enc_format = PEP_enc_none;
     status = mime_encode_message(_src, true, &mimetext);
     assert(status == PEP_STATUS_OK);
-    if (free_ptext)
+    if (free_ptext){
         free(ptext);
+        free_ptext=0;
+    }
     free(_src);
     assert(mimetext);
     if (mimetext == NULL)