mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-22 15:55:57 +00:00
Code Issues Releases Wiki Activity

Prevent commands on disconnected socket

Browse source
This commit is contained in:
M66B 2020-08-28 08:42:40 +02:00
parent 411545f394
commit 0cde8d8726
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/sun/mail/iap/Protocol.java
View file

@ -347,12 +347,15 @@ public class Protocol {
* @return array of Response objects returned by the server * @return array of Response objects returned by the server
*/ */
public synchronized Response[] command(String command, Argument args) { public synchronized Response[] command(String command, Argument args) {
if (socket == null)
return new Response[]{Response.byeResponse(new SocketException("disconnected"))};
if ("LOGOUT".equals(command)) if ("LOGOUT".equals(command))
try { try {
socket.setSoTimeout(10 * 1000); socket.setSoTimeout(10 * 1000);
} catch (SocketException ex) { } catch (SocketException ex) {
eu.faircode.email.Log.e(ex); eu.faircode.email.Log.e(ex);
} }
commandStart(command); commandStart(command);
List<Response> v = new ArrayList<>(); List<Response> v = new ArrayList<>();
boolean done = false; boolean done = false;

7
patches/JavaMail.patch
View file

@ -38,17 +38,20 @@ diff -rupN /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/handlers/handle
for (int i = 0; i < adf.length; i++) { for (int i = 0; i < adf.length; i++) {
diff -rupN /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/iap/Protocol.java ./app/src/main/java/com/sun/mail/iap/Protocol.java diff -rupN /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/iap/Protocol.java ./app/src/main/java/com/sun/mail/iap/Protocol.java
--- /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/iap/Protocol.java 2020-04-03 09:00:49.201313282 +0200 --- /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/iap/Protocol.java 2020-04-03 09:00:49.201313282 +0200
+++ ./app/src/main/java/com/sun/mail/iap/Protocol.java 2020-08-27 20:06:33.871245957 +0200 +++ ./app/src/main/java/com/sun/mail/iap/Protocol.java 2020-08-28 08:09:12.005962733 +0200
@@ -347,6 +347,12 @@ public class Protocol { @@ -347,6 +347,15 @@ public class Protocol {
* @return array of Response objects returned by the server * @return array of Response objects returned by the server
*/ */
public synchronized Response[] command(String command, Argument args) { public synchronized Response[] command(String command, Argument args) {
+ if (socket == null)
+ return new Response[]{Response.byeResponse(new SocketException("disconnected"))};
+ if ("LOGOUT".equals(command)) + if ("LOGOUT".equals(command))
+ try { + try {
+ socket.setSoTimeout(10 * 1000); + socket.setSoTimeout(10 * 1000);
+ } catch (SocketException ex) { + } catch (SocketException ex) {
+ eu.faircode.email.Log.e(ex); + eu.faircode.email.Log.e(ex);
+ } + }
+
commandStart(command); commandStart(command);
List<Response> v = new ArrayList<>(); List<Response> v = new ArrayList<>();
boolean done = false; boolean done = false;