Skip to content

Commit 20bd888

Browse files
committed
Fixed possible nullpointer exceptions
1 parent f58ce0b commit 20bd888

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/util/response/ResponseExtractor.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,33 @@ private static SocketState extractSocketState(State state) {
6161

6262
private static List<Class<AbstractRecord>> extractRecordClasses(ReceivingAction action) {
6363
List<Class<AbstractRecord>> classList = new LinkedList<>();
64-
for (AbstractRecord record : action.getReceivedRecords()) {
65-
classList.add((Class<AbstractRecord>) record.getClass());
64+
if (action.getReceivedRecords() != null) {
65+
for (AbstractRecord record : action.getReceivedRecords()) {
66+
classList.add((Class<AbstractRecord>) record.getClass());
67+
}
6668
}
6769
return classList;
6870
}
6971

7072
private static List<Class<ProtocolMessage>> extractMessageClasses(ReceivingAction action) {
7173
List<Class<ProtocolMessage>> classList = new LinkedList<>();
72-
for (ProtocolMessage message : action.getReceivedMessages()) {
73-
classList.add((Class<ProtocolMessage>) message.getClass());
74+
if (action.getReceivedMessages() != null) {
75+
for (ProtocolMessage message : action.getReceivedMessages()) {
76+
classList.add((Class<ProtocolMessage>) message.getClass());
77+
}
7478
}
7579
return classList;
7680
}
7781

7882
private static boolean didReceiveEncryptedAlert(ReceivingAction action) {
79-
for (AbstractRecord abstractRecord : action.getReceivedRecords()) {
80-
if (abstractRecord instanceof Record) {
81-
Record record = (Record) abstractRecord;
82-
if (record.getContentMessageType() == ProtocolMessageType.ALERT) {
83-
if (record.getLength().getValue() > 6) {
84-
return true;
83+
if (action.getReceivedRecords() != null) {
84+
for (AbstractRecord abstractRecord : action.getReceivedRecords()) {
85+
if (abstractRecord instanceof Record) {
86+
Record record = (Record) abstractRecord;
87+
if (record.getContentMessageType() == ProtocolMessageType.ALERT) {
88+
if (record.getLength().getValue() > 6) {
89+
return true;
90+
}
8591
}
8692
}
8793
}

0 commit comments

Comments
 (0)