bugfix

chenxiaoquan233 · May 10, 2020 · 8b42a86 · 8b42a86
1 parent 2fdc8b9
commit 8b42a86
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/include/Client/Client.h b/src/include/Client/Client.h
@@ -7,7 +7,7 @@
 class Client : public base
 {
 private:
-	File* file;
+	File* file = nullptr;
 	pkt_load* data = nullptr;
 	sockaddr_in serv_addr_cmd;
 	sockaddr_in serv_addr_data;

diff --git a/src/src/Client/Client.cpp b/src/src/Client/Client.cpp
@@ -27,6 +27,7 @@ int Client::recv_cmd(char* buf, int len, int usec)
 
 bool Client::send_file(const char* input_file_name, int path_offs)
 {
+	if (file) file->~File();
     file = new File(input_file_name, MAX_PACKET_DATA_BYTE_LENGTH, 0);
     char* cmd = nullptr;
 	cmd = new char[MAX_PACKET_DATA_BYTE_LENGTH];

diff --git a/src/src/file.cpp b/src/src/file.cpp
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <iostream>
+#include <errno.h>
 #include "../include/file.h"
 
 using namespace std;
@@ -29,7 +30,15 @@ File::File(const char* input_file, int pkt_len, int offset)
     base_offset = offset;
 }
 
-File::~File(){}
+File::~File()
+{
+	if (file_ptr)
+		fclose(file_ptr);
+	if (send_rec)
+		delete[]send_rec;
+	if (file_path)
+		delete[]file_path;
+}
 
 int File::get_tot_num()
 {