sani7/2023-Webservices_And_Applications
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tftp

Browse Source 
try to fix a bug Lorenz told me about
in fread
This commit is contained in:
Sander Speetjens
2023-12-06 07:57:25 +01:00
parent a8537ba6d4
commit d9204ad9ed
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/Core/Src/tftp.c
View File

@@ -78,8 +78,8 @@ void tftp_custom_fseek(tftp_custom_file_t* handle, size_t offset, int whence) {
* @param[in,out] handle Custom file handles * @param[in,out] handle Custom file handles
*/ */
size_t tftp_custom_fread(void* buf, size_t bytes, tftp_custom_file_t* handle) { size_t tftp_custom_fread(void* buf, size_t bytes, tftp_custom_file_t* handle) {
if (handle->offset + bytes > handle->len) { if (handle->offset + bytes >= handle->len) {
bytes = handle->len - handle->offset; bytes = handle->len - handle->offset - 1;
} }
memcpy(buf, handle->data + handle->offset, bytes); memcpy(buf, handle->data + handle->offset, bytes);
handle->offset += bytes; handle->offset += bytes;

2
tests/tfpt_tests.cpp
View File

@@ -76,7 +76,7 @@ TEST(TFTP, custom_fwrite) {
write_file.len = 0; write_file.len = 0;
} }
TEST(TFTP, custom_fread_fwrite_suggested_by_Lorentz) { TEST(TFTP, custom_fread_fwrite_suggested_by_Lorenz) {
write_file.data = (char*)malloc(21 * sizeof(char)); write_file.data = (char*)malloc(21 * sizeof(char));
write_file.len = 21; write_file.len = 21;
write_file.offset = 0; write_file.offset = 0;