DNET/dnetd_old
1
0
Fork 0
mirror of https://github.com/deavminet/dnetd synced 2024-09-21 09:43:37 +02:00
Code Issues Releases Activity

Fixed bug whereby a failed read would cause a null pointer deref in tristanable as the data array would be empty and .ptr is being used so bounds checking code would not apply

Browse Source
This commit is contained in:
Tristan B. Kildaire 2020-09-24 19:11:20 +02:00
parent 9236b54515
commit 6815c51784
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/dnetd/dconnection.d
View File

@ -94,14 +94,20 @@ public class DConnection : Thread
bool status = receiveMessage(socket, receivedBytes);
/* TODO: Check status */
if(status)
{
/* Decode the tristanable message (tagged message) */
receivedMessage = DataMessage.decode(receivedBytes);
/* Decode the tristanable message (tagged message) */
receivedMessage = DataMessage.decode(receivedBytes);
/* Process the message */
process(receivedMessage);
/* Process the message */
process(receivedMessage);
/* TODO: Tristanable needs reserved-tag support (client-side concern) */
/* TODO: Tristanable needs reserved-tag support (client-side concern) */
}
else
{
/* TODO: Error handling */
}
}
}
@ -192,8 +198,8 @@ public class DConnection : Thread
/* Set the type of this connection to `server` */
connType = ConnectionType.SERVER;
}
/* If `register` command (requires: unauthed) */
else if(commandByte == 2 && !hasAuthed)
/* If `register` command (requires: unauthed, client) */
else if(commandByte == 2 && !hasAuthed && connType == ConnectionType.CLIENT)
{
}
@ -290,8 +296,8 @@ public class DConnection : Thread
/* TODO: Implement me, use return value */
writeSocket(tag, reply);
}
/* If `msg` command (requires: authed) */
else if(commandByte == 7 && hasAuthed)
/* If `msg` command (requires: authed, client) */
else if(commandByte == 7 && hasAuthed && connType == ConnectionType.CLIENT)
{
/* Status */
bool status = true;