Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crashes in Ftp::Upload and Ftp::Download with empty files

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1424 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-02-24 16:17:17 +00:00
parent d7496629e3
commit 39afb72c4e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SFML/Network/Ftp.cpp
View File

@ -380,7 +380,8 @@ Ftp::Response Ftp::Download(const std::string& DistantFile, const std::string& D
std::ofstream File((Path + Filename).c_str(), std::ios_base::binary); std::ofstream File((Path + Filename).c_str(), std::ios_base::binary);
if (!File) if (!File)
return Response(Response::InvalidFile); return Response(Response::InvalidFile);
File.write(&FileData[0], static_cast<std::streamsize>(FileData.size())); if (!FileData.empty())
File.write(&FileData[0], static_cast<std::streamsize>(FileData.size()));
} }
} }
} }
@ -402,7 +403,8 @@ Ftp::Response Ftp::Upload(const std::string& LocalFile, const std::string& DestP
std::size_t Length = File.tellg(); std::size_t Length = File.tellg();
File.seekg(0, std::ios::beg); File.seekg(0, std::ios::beg);
std::vector<char> FileData(Length); std::vector<char> FileData(Length);
File.read(&FileData[0], static_cast<std::streamsize>(Length)); if (Length > 0)
File.read(&FileData[0], static_cast<std::streamsize>(Length));
// Extract the filename from the file path // Extract the filename from the file path
std::string Filename = LocalFile; std::string Filename = LocalFile;
@ -700,7 +702,8 @@ void Ftp::DataChannel::Receive(std::vector<char>& Data)
void Ftp::DataChannel::Send(const std::vector<char>& Data) void Ftp::DataChannel::Send(const std::vector<char>& Data)
{ {
// Send data // Send data
myDataSocket.Send(&Data[0], Data.size()); if (!Data.empty())
myDataSocket.Send(&Data[0], Data.size());
// Close the data socket // Close the data socket
myDataSocket.Close(); myDataSocket.Close();