piegames/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* readFile: don't overflow the stack on large files.

Browse source
This commit is contained in:
Eelco Dolstra 2006-10-30 11:56:09 +00:00
parent 8d17265ac4
commit 8478cd260f
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libutil/util.cc
View file

@ -194,12 +194,26 @@ Strings readDirectory(const Path & path)
} }
template <class T>
struct AutoDeleteArray
{
T * p;
AutoDeleteArray(T * p) : p(p) { }
~AutoDeleteArray()
{
delete [] p;
}
};
string readFile(int fd) string readFile(int fd)
{ {
struct stat st; struct stat st;
if (fstat(fd, &st) == -1) if (fstat(fd, &st) == -1)
throw SysError("statting file"); throw SysError("statting file");
unsigned char buf[st.st_size]; /* !!! stack space */
unsigned char * buf = new unsigned char[st.st_size];
AutoDeleteArray<unsigned char> d(buf);
readFull(fd, buf, st.st_size); readFull(fd, buf, st.st_size);
return string((char *) buf, st.st_size); return string((char *) buf, st.st_size);