Fix: some nullpointer references (coverity).

[gigi.git] / tests / org / cacert / gigi / email / TestSendmail.java

diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java
index ce51307be89a7650e97d33223b907162e977edee..898e68ef460d3077e8179150e9eab1052f609472 100644 (file)
--- a/tests/org/cacert/gigi/email/TestSendmail.java
+++ b/tests/org/cacert/gigi/email/TestSendmail.java
@@ -1,12 +1,14 @@
 package org.cacert.gigi.email;
 
-import static org.junit.Assume.*;
-import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 
 import java.io.BufferedReader;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Socket;
 import java.security.GeneralSecurityException;
@@ -52,8 +54,8 @@ public class TestSendmail extends ConfiguredTest {
         EmailProvider.getInstance().sendmail(succmail, subj, msg, "system@cacert.org", "system@cacert.org", "Testtarget", "Testsender", null, false);
 
         Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);
-        PrintWriter pw = new PrintWriter(s.getOutputStream(), true);
-        BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream()));
+        PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);
+        BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));
         pw.println("a001 login " + imapuser + " " + pass);
         imapUntil(br, "a001");
         pw.println("a002 select inbox");
@@ -93,6 +95,9 @@ public class TestSendmail extends ConfiguredTest {
         String line = "";
         while ( !line.startsWith(target)) {
             line = br.readLine();
+            if (line == null) {
+                throw new EOFException();
+            }
             response.append(line);
         }
         return response.toString();