Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 17 additions & 5 deletions src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,19 @@ public final Map<String, String> getOptions() {
return options;
}

/**
* Gets the encoded length of the options extensions.
*
* @return The encoded length of the options extensions.
*/
private int getOptionsLength() {
int optionsLength = 0;
for (final Map.Entry<String, String> entry : options.entrySet()) {
optionsLength += entry.getKey().length() + 1 + entry.getValue().length() + 1;
}
return optionsLength;
}

private void handleOptions(final byte[] data, final int fileLength, final int modeLength) {
int index = fileLength + modeLength + 2;
for (final Map.Entry<String, String> entry : options.entrySet()) {
Expand All @@ -193,6 +206,7 @@ private void handleOptions(final byte[] data, final int fileLength, final int mo
System.arraycopy(value.getBytes(StandardCharsets.US_ASCII), 0, data, index, value.length());
index += value.length();
}
data[index] = 0;
}

private boolean isChar(final byte[] data, int index) {
Expand All @@ -210,10 +224,7 @@ private boolean isChar(final byte[] data, int index) {
public final DatagramPacket newDatagram() {
final int fileLength = fileName.length();
final int modeLength = modeBytes[mode].length;
int optionsLength = 0;
for (final Map.Entry<String, String> entry : options.entrySet()) {
optionsLength += entry.getKey().length() + 1 + entry.getValue().length() + 1;
}
final int optionsLength = getOptionsLength();
final byte[] data = new byte[fileLength + modeLength + 3 + optionsLength];
data[0] = 0;
data[1] = (byte) type;
Expand All @@ -238,6 +249,7 @@ public final DatagramPacket newDatagram() {
final DatagramPacket newDatagram(final DatagramPacket datagram, final byte[] data) {
final int fileLength = fileName.length();
final int modeLength = modeBytes[mode].length;
final int optionsLength = getOptionsLength();
data[0] = 0;
data[1] = (byte) type;
System.arraycopy(fileName.getBytes(Charset.defaultCharset()), 0, data, 2, fileLength);
Expand All @@ -247,7 +259,7 @@ final DatagramPacket newDatagram(final DatagramPacket datagram, final byte[] dat
datagram.setAddress(address);
datagram.setPort(port);
datagram.setData(data);
datagram.setLength(fileLength + modeLength + 3);
datagram.setLength(fileLength + modeLength + 3 + optionsLength);
return datagram;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Map;

import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -69,6 +70,21 @@ void testGetOptions() throws UnknownHostException, TFTPPacketException {
assertEquals("1024", options.get("blksize"));
}

@Test
void testNewDatagramBufferIncludesOptions() throws TFTPPacketException, UnknownHostException {
final DatagramPacket datagramPacket = getDatagramPacket();
final TFTPReadRequestPacket requestPacket = new TFTPReadRequestPacket(datagramPacket);
final byte[] buffer = new byte[datagramPacket.getLength()];
// Simulate a reused send buffer that is not zero-initialized anymore, as in TFTP.bufferedSend().
Arrays.fill(buffer, (byte) 'X');
final DatagramPacket reused = new DatagramPacket(buffer, buffer.length, InetAddress.getLocalHost(), 0);

requestPacket.newDatagram(reused, buffer);

assertEquals(datagramPacket.getLength(), reused.getLength());
assertArrayEquals(datagramPacket.getData(), buffer);
}

@Test
void testNewDatagram() throws TFTPPacketException, UnknownHostException {
final DatagramPacket datagramPacket = getDatagramPacket();
Expand Down