Skip to content

fix: guard NPE in NetworkUtil and concurrent read in IndexService #10743

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 in NetworkUtil and concurrent read in IndexService #10743

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
7 changes: 6 additions & 1 deletion common/src/main/java/org/apache/rocketmq/common/utils/NetworkUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ public static String denormalizeHostAddress(final String bracketedAddress) {

public static SocketAddress string2SocketAddress(final String addr) {
int split = addr.lastIndexOf(":");
if (split < 0) {
throw new IllegalArgumentException("Invalid socket address, missing ':': " + addr);
}
String host = addr.substring(0, split);
String port = addr.substring(split + 1);
return new InetSocketAddress(host, Integer.parseInt(port));
Expand All @@ -201,7 +204,9 @@ public static SocketAddress string2SocketAddress(final String addr) {
public static String socketAddress2String(final SocketAddress addr) {
StringBuilder sb = new StringBuilder();
InetSocketAddress inetSocketAddress = (InetSocketAddress) addr;
sb.append(inetSocketAddress.getAddress().getHostAddress());
// getAddress() returns null when the hostname could not be resolved; fall back to the host string.
InetAddress address = inetSocketAddress.getAddress();
sb.append(address != null ? address.getHostAddress() : inetSocketAddress.getHostString());
sb.append(":");
sb.append(inetSocketAddress.getPort());
return sb.toString();
Expand Down
13 changes: 9 additions & 4 deletions store/src/main/java/org/apache/rocketmq/store/index/IndexService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,16 @@ public boolean load(final boolean lastExitOK) {
}

public long getTotalSize() {
if (indexFileList.isEmpty()) {
return 0;
}
this.readWriteLock.readLock().lock();
try {
if (indexFileList.isEmpty()) {
return 0;
}

return (long) indexFileList.get(0).getFileSize() * indexFileList.size();
return (long) indexFileList.get(0).getFileSize() * indexFileList.size();
} finally {
this.readWriteLock.readLock().unlock();
}
}

public void deleteExpiredFile(long offset) {
Expand Down