Fix 32-bit int shifted >= 32 bits in SSLInputStream.
This code isn't actually called by us, but it's public API.
Bug: 2099901
diff --git a/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java b/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
index 6c23a91..507e14f 100644
--- a/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
+++ b/libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
@@ -94,10 +94,11 @@
* Reads and returns uint64 value.
*/
public long readUint64() throws IOException {
- return (read() << 56) | (read() << 48)
- | (read() << 40) | (read() << 32)
- | (read() << 24) | (read() << 16)
- | (read() << 8) | (read() & 0x00FF);
+ // BEGIN android-changed
+ long hi = readUint32();
+ long lo = readUint32();
+ return (hi << 32) | lo;
+ // END android-changed
}
/**
@@ -131,4 +132,3 @@
return i;
}
}
-
