fumiama/simple-kanban
1
0
Fork 0
mirror of https://github.com/fumiama/simple-kanban.git synced 2026-06-25 13:25:37 +08:00
Code Activity

修复上传逻辑漏洞

Browse Source
This commit is contained in:
fumiama
2021-05-03 00:52:18 +08:00
parent 4ca5bd1434
commit 5380f2420b
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server.c
View File

@@ -210,38 +210,29 @@ int s3_setData(THREADTIMER *timer) {
} }
} }
if(file_size <= BUFSIZ - (is_first_data?0:sizeof(uint32_t))) { if(file_size <= BUFSIZ - (is_first_data?0:sizeof(uint32_t))) {
while(timer->numbytes != file_size - (is_first_data?0:sizeof(uint32_t))) {
timer->numbytes += recv(timer->accept_fd, timer->data + timer->numbytes + (is_first_data?0:sizeof(uint32_t)), BUFSIZ - timer->numbytes - (is_first_data?0:sizeof(uint32_t)), 0);
}
if(fwrite(timer->data + (is_first_data?0:sizeof(uint32_t)), file_size, 1, timer->fp) != 1) { if(fwrite(timer->data + (is_first_data?0:sizeof(uint32_t)), file_size, 1, timer->fp) != 1) {
puts("Set data error."); puts("Set data error.");
return closeFileAndSend(timer, "erro", 4); return closeFileAndSend(timer, "erro", 4);
} else return closeFileAndSend(timer, "succ", 4); } else return closeFileAndSend(timer, "succ", 4);
} else { } else {
if(fwrite(timer->data + (is_first_data?0:sizeof(uint32_t)), BUFSIZ - (is_first_data?0:sizeof(uint32_t)), 1, timer->fp) != 1) { if(fwrite(timer->data + (is_first_data?0:sizeof(uint32_t)), timer->numbytes - (is_first_data?0:sizeof(uint32_t)), 1, timer->fp) != 1) {
puts("Set data error."); puts("Set data error.");
return closeFileAndSend(timer, "erro", 4); return closeFileAndSend(timer, "erro", 4);
} }
int32_t remain = file_size - BUFSIZ; int32_t remain = file_size - BUFSIZ;
while(remain / BUFSIZ > 0) { while(remain > 0) {
printf("remain:%d\n", remain); printf("remain:%d\n", remain);
timer->numbytes = recv(timer->accept_fd, timer->data, BUFSIZ, 0); timer->numbytes = recv(timer->accept_fd, timer->data, BUFSIZ, 0);
if(timer->numbytes == BUFSIZ) { if(fwrite(timer->data, timer->numbytes, 1, timer->fp) != 1) {
if(fwrite(timer->data, BUFSIZ, 1, timer->fp) != 1) { puts("Set data error.");
puts("Set data error."); return closeFileAndSend(timer, "erro", 4);
return closeFileAndSend(timer, "erro", 4);
}
remain -= BUFSIZ;
} else return closeFileAndSend(timer, "erro", 4);
}
if(remain > 0) {
printf("remain:%d\n", remain);
timer->numbytes = recv(timer->accept_fd, timer->data, remain, 0);
printf("Get data size: %tu\n", timer->numbytes);
if(timer->numbytes == remain) {
if(fwrite(timer->data, remain, 1, timer->fp) != 1) {
puts("Set data error.");
return closeFileAndSend(timer, "erro", 4);
} else return closeFileAndSend(timer, "succ", 4);
} }
remain -= timer->numbytes;
} }
return closeFileAndSend(timer, "succ", 4);
} }
return closeFileAndSend(timer, "erro", 4); return closeFileAndSend(timer, "erro", 4);
} }