mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/system/helpers.cpp: fix resource leak ,use new instead of malloc

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a03445fe40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-26 (Fri, 26 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2012-10-26 23:16:30 +02:00
parent cf8f67936a
commit 75937cc89b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/system/helpers.cpp
View File

@@ -246,14 +246,14 @@ std::string trim(std::string &str, const std::string &trimChars /*= " \n\r\t"*/)
CFileHelpers::CFileHelpers()
{
FileBufSize = 0xFFFF;
FileBuf = (char*)malloc(FileBufSize);
FileBuf = new char[FileBufSize];
doCopyFlag = true;
}
CFileHelpers::~CFileHelpers()
{
if (FileBuf != NULL)
free(FileBuf);
delete [] FileBuf;
}
CFileHelpers* CFileHelpers::getInstance()
@@ -271,7 +271,7 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
if ((fd1 = open(Src, O_RDONLY)) < 0)
return false;
if ((fd2 = open(Dst, O_WRONLY | O_CREAT)) < 0) {
close(fd2);
close(fd1);
return false;
}
@@ -294,8 +294,11 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
if (doCopyFlag) {
lseek64(fd2, 0, SEEK_SET);
off64_t fsizeDst64 = lseek64(fd2, 0, SEEK_END);
if (fsizeSrc64 != fsizeDst64)
if (fsizeSrc64 != fsizeDst64){
close(fd1);
close(fd2);
return false;
}
}
}
else { // < 2GB
@@ -316,8 +319,11 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
if (doCopyFlag) {
lseek(fd2, 0, SEEK_SET);
long fsizeDst = lseek(fd2, 0, SEEK_END);
if (fsizeSrc != fsizeDst)
if (fsizeSrc != fsizeDst){
close(fd1);
close(fd2);
return false;
}
}
}
close(fd1);