kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct one of the valgrind errors from the CPackTestAllGenerators test. Do not use auto_ptr on a new [] allocation because auto_ptr does not use delete [].

This commit is contained in:
David Cole 2009-10-26 13:49:20 -04:00
parent 0b8837814a
commit e0bbaa889a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CPack/cmCPackTGZGenerator.cxx
View File

@ -23,7 +23,6 @@
#include <cmsys/SystemTools.hxx> #include <cmsys/SystemTools.hxx>
#include <cm_zlib.h> #include <cm_zlib.h>
#include <libtar/libtar.h> #include <libtar/libtar.h>
#include <memory> // auto_ptr
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
@ -219,9 +218,8 @@ int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
&mydata &mydata
}; };
// Ok, this libtar is not const safe. for now use auto_ptr hack // Ok, this libtar is not const safe. Make a non-const copy of outFileName
char* realName = new char[ strlen(outFileName) + 1 ]; char* realName = new char[ strlen(outFileName) + 1 ];
std::auto_ptr<char> realNamePtr(realName);
strcpy(realName, outFileName); strcpy(realName, outFileName);
int flags = O_WRONLY | O_CREAT; int flags = O_WRONLY | O_CREAT;
int options = 0; int options = 0;
@ -239,6 +237,7 @@ int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): " cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
<< strerror(errno) << std::endl); << strerror(errno) << std::endl);
delete [] realName;
return 0; return 0;
} }
@ -257,6 +256,7 @@ int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
<< pathname << "\"): " << pathname << "\"): "
<< strerror(errno) << std::endl); << strerror(errno) << std::endl);
tar_close(t); tar_close(t);
delete [] realName;
return 0; return 0;
} }
} }
@ -265,6 +265,7 @@ int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_append_eof(): " cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_append_eof(): "
<< strerror(errno) << std::endl); << strerror(errno) << std::endl);
tar_close(t); tar_close(t);
delete [] realName;
return 0; return 0;
} }
@ -272,8 +273,10 @@ int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_close(): " cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_close(): "
<< strerror(errno) << std::endl); << strerror(errno) << std::endl);
delete [] realName;
return 0; return 0;
} }
delete [] realName;
return 1; return 1;
} }