Skip to content

fix: guard NPE/IOOBE edge cases in admin, transaction, store and http client #10733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btlqql wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: guard NPE/IOOBE edge cases in admin, transaction, store and http client #10733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2560,8 +2560,12 @@ private RemotingCommand queryCorrectionOffset(ChannelHandlerContext ctx,
if (compareOffset != null && !compareOffset.isEmpty()) {
for (Map.Entry<Integer, Long> entry : compareOffset.entrySet()) {
Integer queueId = entry.getKey();
correctionOffset.put(queueId,
correctionOffset.get(queueId) > entry.getValue() ? Long.MAX_VALUE : correctionOffset.get(queueId));
Long minOffset = correctionOffset.get(queueId);
// correctionOffset only contains queueIds present in the topic's offset table;
// skip queueIds the compare group has but no other group consumed.
if (minOffset != null) {
correctionOffset.put(queueId, minOffset > entry.getValue() ? Long.MAX_VALUE : minOffset);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public void check(long transactionTimeout, int transactionCheckMax,
}
List<MessageExt> opMsg = pullResult == null ? null : pullResult.getMsgFoundList();
boolean isNeedCheck = opMsg == null && valueOfCurrentMinusBorn > checkImmunityTime
|| opMsg != null && opMsg.get(opMsg.size() - 1).getBornTimestamp() - startTime > transactionTimeout
|| opMsg != null && !opMsg.isEmpty() && opMsg.get(opMsg.size() - 1).getBornTimestamp() - startTime > transactionTimeout
|| valueOfCurrentMinusBorn <= -1;

if (isNeedCheck) {
Expand Down
7 changes: 5 additions & 2 deletions common/src/main/java/org/apache/rocketmq/common/utils/HttpTinyClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.rocketmq.common.utils;

import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
Expand Down Expand Up @@ -49,7 +50,8 @@ static public HttpResult httpGet(String url, List<String> headers, List<String>
if (HttpURLConnection.HTTP_OK == respCode) {
resp = IOTinyUtils.toString(conn.getInputStream(), encoding);
} else {
resp = IOTinyUtils.toString(conn.getErrorStream(), encoding);
InputStream errorStream = conn.getErrorStream();
resp = errorStream == null ? null : IOTinyUtils.toString(errorStream, encoding);
}
return new HttpResult(respCode, resp);
} finally {
Expand Down Expand Up @@ -114,7 +116,8 @@ static public HttpResult httpPost(String url, List<String> headers, List<String>
if (HttpURLConnection.HTTP_OK == respCode) {
resp = IOTinyUtils.toString(conn.getInputStream(), encoding);
} else {
resp = IOTinyUtils.toString(conn.getErrorStream(), encoding);
InputStream errorStream = conn.getErrorStream();
resp = errorStream == null ? null : IOTinyUtils.toString(errorStream, encoding);
}
return new HttpResult(respCode, resp);
} finally {
Expand Down
4 changes: 3 additions & 1 deletion store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,9 @@ public long estimateMessageCount(long from, long to, MessageFilter filter) {
ConsumeQueueExt.CqExtUnit ext = null;
if (isExtWriteEnable()) {
ext = consumeQueueExt.get(tagCode);
tagCode = ext.getTagsCode();
if (ext != null) {
tagCode = ext.getTagsCode();
}
}
if (filter.isMatchedByConsumeQueue(tagCode, ext)) {
match++;
Expand Down