archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8207960: Non-negative WINDOW_UPDATE increments may leave the stream window size negative

Browse source 
Reviewed-by: michaelm
This commit is contained in:
Chris Hegarty 2018-07-24 10:07:26 +01:00
parent e605cae39f
commit 577cdf1f49
3 changed files with 192 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/java.net.http/share/classes/jdk/internal/net/http/WindowController.java
View file

@ -246,8 +246,9 @@ final class WindowController {
debug.log("WARNING: No entry found for streamid: %s. May be cancelled?",
streamid);
} else {
size += amount;
if (size < 0)
int prev = size;
size = prev + amount;
if (size < prev)
return false;
streams.put(streamid, size);
if (debug.on())
@ -314,17 +315,17 @@ final class WindowController {
}
}
// /** Returns the Send Window size for the given stream. */
// int streamWindowSize(int streamid) {
// controllerLock.lock();
// try {
// Integer size = streams.get(streamid);
// if (size == null)
// throw new InternalError("Expected entry for streamid: " + streamid);
// return size;
// } finally {
// controllerLock.unlock();
// }
// }
/** Returns the Send Window size for the given stream. */
int streamWindowSize(int streamid) {
controllerLock.lock();
try {
Integer size = streams.get(streamid);
if (size == null)
throw new InternalError("Expected entry for streamid: " + streamid);
return size;
} finally {
controllerLock.unlock();
}
}
}