Skip to content

Standardize memory allocation of uFile::name to new[] #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yingted wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Standardize memory allocation of uFile::name to new[] #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions source/src/library/uFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,17 +448,19 @@ void uFile::StatusFailure::defaultTerminate() const {
uFile::~uFile() {
if ( accessCnt != 0 && ! std::uncaught_exception() ) {
TerminateFailure temp( *this, EINVAL, accessCnt, "terminating access with outstanding accessor(s)" );
if ( name != 0 ) delete name; // safe to delete name as the name is copied in the exception object
if ( name != 0 ) delete[] name; // safe to delete name as the name is copied in the exception object
_Throw temp;
} // if
if ( name != 0 ) delete name; // safe to delete name as the name is copied in the exception object
if ( name != 0 ) delete[] name; // safe to delete name as the name is copied in the exception object
} // uFile::~uFile


const char *uFile::setName( char *name ) {
// File name is NOT copied => name must exist for the duration of the uFile object.
// File name is copied, so it can be deleted in the destructor
char *temp = uFile::name; // copy previous file-name address
uFile::name = name;
const size_t bytes = strlen( name ) + 1;
uFile::name = new char[bytes];
memcpy( uFile::name, name, bytes );
return temp; // return previous file-name address
} // uFile::setName

Expand Down