Small change to avoid AIOOBE when converting from Reader into InputStream in constructor

augustd · augustd · commit 09b31c1da2a2 · 2010-10-14T22:56:18.000Z
diff --git a/src/main/java/org/owasp/esapi/reference/crypto/ReferenceEncryptedProperties.java b/src/main/java/org/owasp/esapi/reference/crypto/ReferenceEncryptedProperties.java
@@ -179,6 +179,8 @@ public void load(InputStream in) throws IOException {
 	@Override
 	public void load(Reader in) throws IOException {
 
+		if (in == null) return;
+
 		//read from the reader into a StringBuffer
 		char[] cbuf				= new char[65536];
 		BufferedReader buff		= new BufferedReader(in);
@@ -187,7 +189,7 @@ public void load(Reader in) throws IOException {
 		int read_this_time = 0;
 		while (read_this_time != -1) {
 			read_this_time = buff.read(cbuf, 0, 65536);
-			contents.append(cbuf, 0, read_this_time);
+			if (read_this_time > 0) contents.append(cbuf, 0, read_this_time);
 		}
 
 		//create a new InputStream from the StringBuffer
