[haiku-commits] haiku: hrev45867 - in src: servers/app/drawing/interface/html5 add-ons/kernel/file_systems/udf
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 17 Jul 2013 18:26:20 +0200 (CEST)
hrev45867 adds 2 changesets to branch 'master'
old head: be064b5af3f60efe4e031e2a36f280a44bed65da
new head: 2aa0e54e4f600ae35bbb47169349ca582167ca10
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=2aa0e54+%5Ebe064b5
----------------------------------------------------------------------------
7a569c8: Fix Called C++ object pointer is null
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
2aa0e54: Fix called C++ object pointer is null
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 7 deletions(-)
src/add-ons/kernel/file_systems/udf/Icb.cpp | 4 +++-
.../drawing/interface/html5/HTML5DrawingEngine.cpp | 15 +++++++++------
############################################################################
Commit: 7a569c82507d441c1e1f47f48f76d02c5baa3542
URL: http://cgit.haiku-os.org/haiku/commit/?id=7a569c8
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Wed Jul 17 09:56:22 2013 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Jul 17 16:26:08 2013 UTC
Fix Called C++ object pointer is null
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
index f1434a3..ce6e4e8 100644
--- a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
+++ b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
@@ -1095,14 +1095,17 @@ HTML5DrawingEngine::_ExtractBitmapRegions(ServerBitmap&
bitmap, uint32 options,
bitmaps[i] = new(std::nothrow) UtilityBitmap(
BRect(0, 0, targetWidth - 1, targetHeight - 1),
bitmap.ColorSpace(), 0);
- if (bitmaps[i] == NULL)
+
+ if (bitmaps[i] == NULL) {
result = B_NO_MEMORY;
+ } else {
+ result = bitmaps[i]->ImportBits(bitmap.Bits(),
bitmap.BitsLength(),
+ bitmap.BytesPerRow(),
bitmap.ColorSpace(), sourceRect.LeftTop(),
+ BPoint(0, 0), targetWidth,
targetHeight);
- result = bitmaps[i]->ImportBits(bitmap.Bits(),
bitmap.BitsLength(),
- bitmap.BytesPerRow(), bitmap.ColorSpace(),
sourceRect.LeftTop(),
- BPoint(0, 0), targetWidth, targetHeight);
- if (result != B_OK)
- delete bitmaps[i];
+ if (result != B_OK)
+ delete bitmaps[i];
+ }
}
if (result != B_OK) {
############################################################################
Revision: hrev45867
Commit: 2aa0e54e4f600ae35bbb47169349ca582167ca10
URL: http://cgit.haiku-os.org/haiku/commit/?id=2aa0e54
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Wed Jul 17 10:39:14 2013 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Jul 17 16:26:10 2013 UTC
Fix called C++ object pointer is null
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/udf/Icb.cpp
b/src/add-ons/kernel/file_systems/udf/Icb.cpp
index c924966..f88f227 100644
--- a/src/add-ons/kernel/file_systems/udf/Icb.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Icb.cpp
@@ -116,8 +116,10 @@ Icb::Icb(Volume *volume, long_address address)
"%d, length = %" B_PRIu32 ")\n", volume, address.block(),
address.partition(), address.length()));
- if (volume == NULL)
+ if (volume == NULL) {
fInitStatus = B_BAD_VALUE;
+ return;
+ }
off_t block;
status_t status = fVolume->MapBlock(address, &block);
Other related posts:
- » [haiku-commits] haiku: hrev45867 - in src: servers/app/drawing/interface/html5 add-ons/kernel/file_systems/udf - korli
