haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use heap instead of stack for CopyStreamData

This commit is contained in:
Jon Evans 2021-11-10 22:05:23 -05:00
parent cc938e7a67
commit 16a34e6adb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wxstream_helper.h
View File

@ -20,6 +20,7 @@
#ifndef WXSTREAM_HELPER_H #ifndef WXSTREAM_HELPER_H
#define WXSTREAM_HELPER_H #define WXSTREAM_HELPER_H
#include <vector>
#include <wx/log.h> #include <wx/log.h>
#include <wx/wfstream.h> #include <wx/wfstream.h>
@ -27,19 +28,21 @@
static bool CopyStreamData( wxInputStream& inputStream, wxOutputStream& outputStream, static bool CopyStreamData( wxInputStream& inputStream, wxOutputStream& outputStream,
wxFileOffset size ) wxFileOffset size )
{ {
wxChar buf[128 * 1024]; constexpr size_t bufSize = 128 * 1024;
int readSize = 128 * 1024; std::vector<wxChar> buf( bufSize );
wxFileOffset copiedData = 0; wxFileOffset copiedData = 0;
wxFileOffset readSize = bufSize;
for( ; ; ) for( ; ; )
{ {
if(size != -1 && copiedData + readSize > size ) if(size != -1 && copiedData + readSize > size )
readSize = size - copiedData; readSize = size - copiedData;
inputStream.Read( buf, readSize ); inputStream.Read( buf.data(), readSize );
size_t actuallyRead = inputStream.LastRead(); size_t actuallyRead = inputStream.LastRead();
outputStream.Write( buf, actuallyRead ); outputStream.Write( buf.data(), actuallyRead );
if( outputStream.LastWrite() != actuallyRead ) if( outputStream.LastWrite() != actuallyRead )
{ {
@ -55,6 +58,7 @@ static bool CopyStreamData( wxInputStream& inputStream, wxOutputStream& outputSt
else else
{ {
copiedData += actuallyRead; copiedData += actuallyRead;
if( copiedData >= size ) if( copiedData >= size )
break; break;
} }