changeset in /hg/icedtea6: 2009-02-11 Marc Schoenefeld <mschoen...

[Omair Majid]

changeset 24c29e381e49 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=24c29e381e49
description:
	2009-02-11  Marc Schoenefeld <mschoene at redhat.com>
	            Omair Majid  <omajid at redhat.com>

	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
	    (write): Fix bounds checking.

diffstat:

2 files changed, 9 insertions(+), 12 deletions(-)
ChangeLog                                                                          |    6 ++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java |   15 ++--------

diffs (39 lines):

diff -r 5d4d8012aa03 -r 24c29e381e49 ChangeLog
--- a/ChangeLog	Wed Feb 11 02:18:27 2009 +0000
+++ b/ChangeLog	Wed Feb 11 09:14:17 2009 -0500
@@ -1,3 +1,9 @@ 2009-02-11  Andrew John Hughes  <ahughes
+2009-02-11  Marc Schoenefeld <mschoene at redhat.com>
+            Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(write): Fix bounds checking.
+
 2009-02-11  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 5d4d8012aa03 -r 24c29e381e49 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Wed Feb 11 02:18:27 2009 +0000
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Wed Feb 11 09:14:17 2009 -0500
@@ -151,19 +151,10 @@ public final class PulseAudioSourceDataL
 			throw new IllegalArgumentException(
 					"amount of data to write does not represent an integral number of frames");
 		}
-		if (length < 0) {
-			throw new IllegalArgumentException("length is negative");
-		}
-
-		if (offset < 0) {
-			throw new ArrayIndexOutOfBoundsException("offset is negative: "
-					+ offset);
-		}
-
-		if (length + offset > data.length) {
+		if (length < 0 || offset < 0 || offset > data.length - length) {
 			throw new ArrayIndexOutOfBoundsException(
-					"writing data beyond the length of the array: "
-							+ (length + offset));
+					"Overflow condition: buffer.length=" + data.length + 
+							" offset= " + offset + " length=" + length );
 		}
 
 		int position = offset;