andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Increment and Decrement count positive check in ReferenceCountUtil (#11523)

Browse Source 
Motivation:
We should have guards in place to check increment or decrement count in `ReferenceCountUtil`. Increment and Decrement counts must be a positive integer.

Modification:
Added `ObjectUtil#checkPositive` checks.

Result:
Prevent release due to invalid count.
This commit is contained in:
Aayush Atharva 2021-07-30 00:21:01 +05:30 committed by GitHub
parent b6da6f5828
commit 82418dafec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/io/netty/util/ReferenceCountUtil.java
View File

@ -15,6 +15,7 @@
*/
package io.netty.util;
import io.netty.util.internal.ObjectUtil;
import io.netty.util.internal.StringUtil;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
@ -48,6 +49,7 @@ public final class ReferenceCountUtil {
*/
@SuppressWarnings("unchecked")
public static <T> T retain(T msg, int increment) {
ObjectUtil.checkPositive(increment, "increment");
if (msg instanceof ReferenceCounted) {
return (T) ((ReferenceCounted) msg).retain(increment);
}
@ -95,6 +97,7 @@ public final class ReferenceCountUtil {
* If the specified message doesn't implement {@link ReferenceCounted}, this method does nothing.
*/
public static boolean release(Object msg, int decrement) {
ObjectUtil.checkPositive(decrement, "decrement");
if (msg instanceof ReferenceCounted) {
return ((ReferenceCounted) msg).release(decrement);
}
@ -125,6 +128,7 @@ public final class ReferenceCountUtil {
*/
public static void safeRelease(Object msg, int decrement) {
try {
ObjectUtil.checkPositive(decrement, "decrement");
release(msg, decrement);
} catch (Throwable t) {
if (logger.isWarnEnabled()) {
@ -154,6 +158,7 @@ public final class ReferenceCountUtil {
*/
@Deprecated
public static <T> T releaseLater(T msg, int decrement) {
ObjectUtil.checkPositive(decrement, "decrement");
if (msg instanceof ReferenceCounted) {
ThreadDeathWatcher.watch(Thread.currentThread(), new ReleasingTask((ReferenceCounted) msg, decrement));
}