added recoverable throwing of ShortBufferException

dghgit · dghgit · commit f3efebfdb44d · 2015-07-08T16:38:06.000+10:00
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
@@ -338,11 +338,16 @@ protected int engineUpdate(
         int     outputOffset) 
         throws ShortBufferException 
     {
+        if (outputOffset + inputLen > output.length)
+        {
+            throw new ShortBufferException("output buffer too short for input.");
+        }
+
         try
         {
-        cipher.processBytes(input, inputOffset, inputLen, output, outputOffset);
+            cipher.processBytes(input, inputOffset, inputLen, output, outputOffset);
 
-        return inputLen;
+            return inputLen;
         }
         catch (DataLengthException e)
         {

Original file line number	Diff line number	Diff line change
`@@ -338,11 +338,16 @@ protected int engineUpdate(`
`338`	`338`	`int outputOffset)`
`339`	`339`	`throws ShortBufferException`
`340`	`340`	`{`
	`341`	`+ if (outputOffset + inputLen > output.length)`
	`342`	`+ {`
	`343`	`+ throw new ShortBufferException("output buffer too short for input.");`
	`344`	`+ }`
	`345`	`+`
`341`	`346`	`try`
`342`	`347`	`{`
`343`		`- cipher.processBytes(input, inputOffset, inputLen, output, outputOffset);`
	`348`	`+ cipher.processBytes(input, inputOffset, inputLen, output, outputOffset);`
`344`	`349`
`345`		`- return inputLen;`
	`350`	`+ return inputLen;`
`346`	`351`	`}`
`347`	`352`	`catch (DataLengthException e)`
`348`	`353`	`{`