OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ObjectInputStream.java (readFields): Use long datatype when shifting byte values more then 24 bits left.

Browse Source 
2004-07-09  Michael Koch  <konqueror@gmx.de>

	* java/io/ObjectInputStream.java (readFields): Use long datatype
	when shifting byte values more then 24 bits left.

From-SVN: r84382
This commit is contained in:
Michael Koch 2004-07-09 15:37:31 +00:00 committed by Michael Koch
parent 559b79cf2b
commit 3d5f053c02
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2004-07-09 Michael Koch <konqueror@gmx.de>
* java/io/ObjectInputStream.java (readFields): Use long datatype
when shifting byte values more then 24 bits left.
2004-07-09 Michael Koch <konqueror@gmx.de> 2004-07-09 Michael Koch <konqueror@gmx.de>
* java/util/zip/DeflaterOutputStream.java, * java/util/zip/DeflaterOutputStream.java,

16
libjava/java/io/ObjectInputStream.java
View File

@ -1332,10 +1332,10 @@ public class ObjectInputStream extends InputStream
int off = field.getOffset(); int off = field.getOffset();
return (long)(((prim_field_data[off++] & 0xFF) << 56) return (long)(((prim_field_data[off++] & 0xFFL) << 56)
| ((prim_field_data[off++] & 0xFF) << 48) | ((prim_field_data[off++] & 0xFFL) << 48)
| ((prim_field_data[off++] & 0xFF) << 40) | ((prim_field_data[off++] & 0xFFL) << 40)
| ((prim_field_data[off++] & 0xFF) << 32) | ((prim_field_data[off++] & 0xFFL) << 32)
| ((prim_field_data[off++] & 0xFF) << 24) | ((prim_field_data[off++] & 0xFF) << 24)
| ((prim_field_data[off++] & 0xFF) << 16) | ((prim_field_data[off++] & 0xFF) << 16)
| ((prim_field_data[off++] & 0xFF) << 8) | ((prim_field_data[off++] & 0xFF) << 8)
@ -1369,10 +1369,10 @@ public class ObjectInputStream extends InputStream
int off = field.getOffset(); int off = field.getOffset();
return Double.longBitsToDouble return Double.longBitsToDouble
( (long) (((prim_field_data[off++] & 0xFF) << 56) ( (long) (((prim_field_data[off++] & 0xFFL) << 56)
| ((prim_field_data[off++] & 0xFF) << 48) | ((prim_field_data[off++] & 0xFFL) << 48)
| ((prim_field_data[off++] & 0xFF) << 40) | ((prim_field_data[off++] & 0xFFL) << 40)
| ((prim_field_data[off++] & 0xFF) << 32) | ((prim_field_data[off++] & 0xFFL) << 32)
| ((prim_field_data[off++] & 0xFF) << 24) | ((prim_field_data[off++] & 0xFF) << 24)
| ((prim_field_data[off++] & 0xFF) << 16) | ((prim_field_data[off++] & 0xFF) << 16)
| ((prim_field_data[off++] & 0xFF) << 8) | ((prim_field_data[off++] & 0xFF) << 8)