[haiku-commits] haiku: hrev45868 - in src: add-ons/translators/icns bin/bfs_tools/lib
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 17 Jul 2013 18:34:07 +0200 (CEST)
hrev45868 adds 2 changesets to branch 'master'
old head: 2aa0e54e4f600ae35bbb47169349ca582167ca10
new head: fa49409097fd2e5fc52950f1536d058147e13331
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=fa49409+%5E2aa0e54
----------------------------------------------------------------------------
15be2c6: Fix called C++ object pointer is null
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
fa49409: Use delete[] instead of delete
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 5 deletions(-)
src/add-ons/translators/icns/ICNSLoader.cpp | 8 ++++----
src/bin/bfs_tools/lib/Inode.cpp | 4 +++-
############################################################################
Commit: 15be2c601874b5ea8317151e99a293202851cc74
URL: http://cgit.haiku-os.org/haiku/commit/?id=15be2c6
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Wed Jul 17 10:57:01 2013 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Jul 17 16:29:29 2013 UTC
Fix called C++ object pointer is null
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/bin/bfs_tools/lib/Inode.cpp b/src/bin/bfs_tools/lib/Inode.cpp
index f13b615..9f4634f 100644
--- a/src/bin/bfs_tools/lib/Inode.cpp
+++ b/src/bin/bfs_tools/lib/Inode.cpp
@@ -621,8 +621,10 @@ Inode::EmptyInode(Disk *disk, const char *name, int32 mode)
}
Inode *object = new (std::nothrow) Inode(disk, inode);
- if (object == NULL)
+ if (object == NULL) {
free(inode);
+ return NULL;
+ }
object->AcquireBuffer();
// this must not be deleted anymore!
############################################################################
Revision: hrev45868
Commit: fa49409097fd2e5fc52950f1536d058147e13331
URL: http://cgit.haiku-os.org/haiku/commit/?id=fa49409
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Wed Jul 17 10:14:29 2013 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Jul 17 16:31:28 2013 UTC
Use delete[] instead of delete
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/translators/icns/ICNSLoader.cpp
b/src/add-ons/translators/icns/ICNSLoader.cpp
index 49f27e9..ee25585 100644
--- a/src/add-ons/translators/icns/ICNSLoader.cpp
+++ b/src/add-ons/translators/icns/ICNSLoader.cpp
@@ -72,7 +72,7 @@ ICNSLoader::ICNSLoader(BPositionIO *stream)
&fIconFamily);
if (status != 0) {
- delete icnsDataBuffer;
+ delete[] icnsDataBuffer;
return;
}
@@ -98,9 +98,9 @@ ICNSLoader::ICNSLoader(BPositionIO *stream)
fFormatList.SortItems(compareTypes);
- delete icnsDataBuffer;
+ delete[] icnsDataBuffer;
- fLoaded = true;
+ fLoaded = true;
}
@@ -177,7 +177,7 @@ ICNSLoader::GetIcon(BPositionIO *target, int index)
}
target->Write(rowBuff, iconImage.imageWidth * sizeof(uint32));
}
- delete rowBuff;
+ delete[] rowBuff;
icns_free_image(&iconImage);
return B_OK;
Other related posts:
- » [haiku-commits] haiku: hrev45868 - in src: add-ons/translators/icns bin/bfs_tools/lib - korli
