From 29ae7e8ed24231312ddd4fd330d5000411bc1891 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sun, 18 Jul 2021 16:04:48 +0200
Subject: [PATCH] fix #1845: fixed an error during writing to closed socket

---
 desktop/scripts/ipc-handlers/browser-extension-connector.js | 6 +++++-
 release-notes.md                                            | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/desktop/scripts/ipc-handlers/browser-extension-connector.js b/desktop/scripts/ipc-handlers/browser-extension-connector.js
index 70d6b09d..dce1ac26 100644
--- a/desktop/scripts/ipc-handlers/browser-extension-connector.js
+++ b/desktop/scripts/ipc-handlers/browser-extension-connector.js
@@ -398,7 +398,11 @@ function sendMessageToSocket(socket, message) {
     const lengthBytes = Buffer.from(lengthBuf);
     const data = Buffer.concat([lengthBytes, responseData]);
 
-    socket.write(data);
+    try {
+        socket.write(data);
+    } catch (e) {
+        logger.error(`Error writing to socket ${state.socketId}`, e);
+    }
 }
 
 function sendToRenderer(event, socketId, data) {
diff --git a/release-notes.md b/release-notes.md
index d44133ab..d21df561 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.18.7 (2021-07-18)
+`-` fix #1845: fixed a visible crash on socket write error  
+
 ##### v1.18.6 (2021-05-19)
 `-` fix #1824: saving KDBX3 files with compression disabled  
 `-` fix #1818: extension connection error if browser cannot be identified