6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-18 11:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Make sure the Archive gets deleted if there's an error.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18869 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2004-12-13 03:22:31 +00:00
parent 061e9491f8
commit 518ec2ea1f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Archive/ArchiveReader.cpp
View File

@ -282,9 +282,9 @@ Archive::loadArchive() {
Archive* Archive*
Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) { Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) {
try { try {
Archive* result = new Archive(file, true); std::auto_ptr<Archive> result ( new Archive(file, true));
result->loadArchive(); result->loadArchive();
return result; return result.release();
} catch (const std::string& msg) { } catch (const std::string& msg) {
if (ErrorMessage) { if (ErrorMessage) {
*ErrorMessage = msg; *ErrorMessage = msg;
@ -377,9 +377,9 @@ Archive::loadSymbolTable() {
Archive* Archive*
Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) { Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) {
try { try {
Archive* result = new Archive(file, true); std::auto_ptr<Archive> result ( new Archive(file, true) );
result->loadSymbolTable(); result->loadSymbolTable();
return result; return result.release();
} catch (const std::string& msg) { } catch (const std::string& msg) {
if (ErrorMessage) { if (ErrorMessage) {
*ErrorMessage = msg; *ErrorMessage = msg;

8
lib/Bytecode/Archive/ArchiveReader.cpp
View File

@ -282,9 +282,9 @@ Archive::loadArchive() {
Archive* Archive*
Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) { Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) {
try { try {
Archive* result = new Archive(file, true); std::auto_ptr<Archive> result ( new Archive(file, true));
result->loadArchive(); result->loadArchive();
return result; return result.release();
} catch (const std::string& msg) { } catch (const std::string& msg) {
if (ErrorMessage) { if (ErrorMessage) {
*ErrorMessage = msg; *ErrorMessage = msg;
@ -377,9 +377,9 @@ Archive::loadSymbolTable() {
Archive* Archive*
Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) { Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) {
try { try {
Archive* result = new Archive(file, true); std::auto_ptr<Archive> result ( new Archive(file, true) );
result->loadSymbolTable(); result->loadSymbolTable();
return result; return result.release();
} catch (const std::string& msg) { } catch (const std::string& msg) {
if (ErrorMessage) { if (ErrorMessage) {
*ErrorMessage = msg; *ErrorMessage = msg;