Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error checks when copying data in the archive sample

Browse Source 
Errors when writing the output data in CopyStreamData() were not
detected.
This commit is contained in:
Vadim Zeitlin
2018-03-31 01:34:35 +02:00
parent 36fe1e0f66
commit 8de66bc753
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/archive/archive.cpp
View File

@@ -138,7 +138,14 @@ bool ArchiveApp::CopyStreamData(wxInputStream& inputStream, wxOutputStream& outp
if (copiedData + readSize > size) if (copiedData + readSize > size)
readSize = size - copiedData; readSize = size - copiedData;
inputStream.Read(buf, readSize); inputStream.Read(buf, readSize);
outputStream.Write(buf, readSize); size_t actuallyRead = inputStream.LastRead();
outputStream.Write(buf, actuallyRead);
if (outputStream.LastWrite() != actuallyRead)
{
wxLogError("Failed to output data");
return false;
}
copiedData += readSize; copiedData += readSize;
} }
@@ -170,7 +177,8 @@ int ArchiveApp::DoCreate()
} }
if (!archiveOutputStream->PutNextEntry(inputFileName.GetFullName(), wxDateTime::Now(), inputFileStream.GetLength())) if (!archiveOutputStream->PutNextEntry(inputFileName.GetFullName(), wxDateTime::Now(), inputFileStream.GetLength()))
break; break;
CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength()); if (!CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength()))
return 1;
} }
if (archiveOutputStream->Close()) if (archiveOutputStream->Close())
@@ -225,7 +233,8 @@ int ArchiveApp::DoExtract()
{ {
wxPrintf("Extracting: %s...\n", entry->GetName()); wxPrintf("Extracting: %s...\n", entry->GetName());
wxTempFileOutputStream outputFileStream(entry->GetName()); wxTempFileOutputStream outputFileStream(entry->GetName());
CopyStreamData(*archiveStream, outputFileStream, entry->GetSize()); if (!CopyStreamData(*archiveStream, outputFileStream, entry->GetSize()))
return 1;
outputFileStream.Commit(); outputFileStream.Commit();
} }
wxPrintf("Extracted all files\n"); wxPrintf("Extracted all files\n");