Skip to content

R
riscv-gcc-1
Commit 3d5f053c by Michael Koch Committed by Michael Koch
Options

ObjectInputStream.java (readFields): Use long datatype when shifting byte values… 

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

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
parent 559b79cf
Showing with 13 additions and 8 deletions
libjava/ChangeLog
2004-07-09 Michael Koch <konqueror@gmx.de> 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>
* java/util/zip/DeflaterOutputStream.java, * java/util/zip/DeflaterOutputStream.java,
java/util/zip/GZIPInputStream.java, java/util/zip/GZIPInputStream.java,
java/util/zip/GZIPOutputStream.java, java/util/zip/GZIPOutputStream.java,
......
libjava/java/io/ObjectInputStream.java
...@@ -1332,10 +1332,10 @@ public class ObjectInputStream extends InputStream ...@@ -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 ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment