From 89ee05e66230907b334b810d3e7156a4afdd0580 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 24 Sep 2009 15:30:09 -0700 Subject: [PATCH] Fix 32-bit int shifted >= 32 bits in SSLInputStream. This code isn't actually called by us, but it's public API. Bug: 2099901 --- .../org/apache/harmony/xnet/provider/jsse/SSLInputStream.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 6c23a912d..507e14f1a 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 @@ public abstract class SSLInputStream extends InputStream { * 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 @@ public abstract class SSLInputStream extends InputStream { return i; } } - -- 2.11.0