infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-18 10:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

7107013: sun.jvm.hotspot.runtime.Bytes.swapLong conversion to long mishandled

Browse Source 
Cast to long to avoid truncation in swapLong()

Reviewed-by: dsamersoff
This commit is contained in:
Sharath Ballal 2016-11-16 14:11:30 +03:00 committed by Dmitry Samersoff
parent 7d9d3aa1a0
commit 7c690441e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Bytes.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -51,7 +51,7 @@ public class Bytes {
if (!swap)
return x;
return (swapShort((short) x) << 16) | (swapShort((short) (x >> 16)) & 0xFFFF);
return ((int)swapShort((short) x) << 16) | (swapShort((short) (x >> 16)) & 0xFFFF);
}
/** Should only swap if the hardware's underlying byte order is
@ -60,6 +60,6 @@ public class Bytes {
if (!swap)
return x;
return (swapInt((int) x) << 32) | (swapInt((int) (x >> 32)) & 0xFFFFFFFF);
return ((long)swapInt((int) x) << 32) | (swapInt((int) (x >> 32)) & 0xFFFFFFFF);
}
}