Merge pull request #1310 from Hirobreak/crash-alert

Don't close App if Alice can run

Author: Erika Perugachi

electron_app/electron-starter.js

@@ -41,7 +41,7 @@ async function initApp() {
     console.log(ex);
   }
 
-  await startAlice();
+  await startAlice(true);
   await checkReachability();
 
   const [existingAccount] = await dbManager.getAccount();

electron_app/src/aliceManager.js

@@ -75,7 +75,7 @@ const getPassword = () => {
   return password;
 };
 
-const startAlice = async () => {
+const startAlice = async onAppOpened => {
   aliceStartTimeout = null;
   if (!alice) {
     const myPort = await portscanner.findAPortNotInUse(8085);
@@ -103,7 +103,7 @@ const startAlice = async () => {
         `Unable to initialize encryption service. ${data}`
       );
       console.log(`-----alice-----\nError:\n${data}\n -----end-----`);
-      app.quit();
+      if (onAppOpened) app.quit();
     });
     alice.stdout.setEncoding('utf8');
     alice.stdout.on('data', data => {
@@ -116,7 +116,7 @@ const startAlice = async () => {
         return;
       }
       aliceStartTimeout = setTimeout(() => {
-        startAlice();
+        startAlice(onAppOpened);
       }, 500);
     });
 

signal_interface/src/crypto/signal.cpp

@@ -64,11 +64,17 @@ int CriptextSignal::decryptText(uint8_t **plaintext_data, size_t *plaintext_len,
             const uint8_t *messageData = reinterpret_cast<const uint8_t*>(textFromB64);
             signal_message *incoming_message = 0;
             signal_message_deserialize(&incoming_message, messageData, decode_len, global_context);
+            if (incoming_message <= 0) {
+                return -2
+            }
             result = session_cipher_decrypt_signal_message(session_cipher, incoming_message, 0, &plainMessage);
         } else {
             const uint8_t *preKeyMessageData = reinterpret_cast<const uint8_t*>(textFromB64);
             pre_key_signal_message *incoming_message = 0;
             pre_key_signal_message_deserialize(&incoming_message, preKeyMessageData, decode_len, global_context);
+            if (incoming_message <= 0) {
+                return -2
+            }
             result = session_cipher_decrypt_pre_key_signal_message(session_cipher, incoming_message, 0, &plainMessage);
         }