hrev49350 adds 3 changesets to branch 'master'
old head: 494fe5a431e984444293be8469d0d96bd0303574
new head: 02ab820d0e26d680b9d158024b1cde1bc5ded6c0
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=02ab820d0e26+%5E494fe5a431e9
----------------------------------------------------------------------------
8d449661cabc: CID 743867: Memleak in DiskUsage
24b1f931b3a8: LongAndDragTrackingFilter: Unitialized member
CID 611005
02ab820d0e26: Backgrounds: FlattenedSize() can be negative (error status)
CID 610928.
[ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 10 insertions(+), 4 deletions(-)
src/apps/diskusage/Scanner.cpp | 4 +++-
src/kits/shared/LongAndDragTrackingFilter.cpp | 3 ++-
src/preferences/backgrounds/BackgroundImage.cpp | 7 +++++--
############################################################################
Commit: 8d449661cabc6ccab0681f6b2c2143b2547ab535
URL: http://cgit.haiku-os.org/haiku/commit/?id=8d449661cabc
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Thu Jul 2 01:42:16 2015 UTC
CID 743867: Memleak in DiskUsage
----------------------------------------------------------------------------
diff --git a/src/apps/diskusage/Scanner.cpp b/src/apps/diskusage/Scanner.cpp
index 0129fea..ac551c9 100644
--- a/src/apps/diskusage/Scanner.cpp
+++ b/src/apps/diskusage/Scanner.cpp
@@ -230,8 +230,10 @@ Scanner::_GetFileInfo(BDirectory* dir, FileInfo* parent)
thisDir->count = 0;
while (true) {
- if (fQuitRequested)
+ if (fQuitRequested) {
+ delete thisDir;
return NULL;
+ }
if (dir->GetNextEntry(&entry) == B_ENTRY_NOT_FOUND)
break;
############################################################################
Commit: 24b1f931b3a88d14f5246d1cf614c40e8a5c560a
URL: http://cgit.haiku-os.org/haiku/commit/?id=24b1f931b3a8
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Thu Jul 2 02:01:57 2015 UTC
LongAndDragTrackingFilter: Unitialized member
CID 611005
----------------------------------------------------------------------------
diff --git a/src/kits/shared/LongAndDragTrackingFilter.cpp
b/src/kits/shared/LongAndDragTrackingFilter.cpp
index b975844..754a3cf 100644
--- a/src/kits/shared/LongAndDragTrackingFilter.cpp
+++ b/src/kits/shared/LongAndDragTrackingFilter.cpp
@@ -43,7 +43,8 @@ LongAndDragTrackingFilter::LongAndDragTrackingFilter(uint32
longMessageWhat,
fDragMessageWhat(dragMessageWhat),
fMessageRunner(NULL),
fClickButtons(0),
- fSquaredRadiusThreshold(radiusThreshold * radiusThreshold)
+ fSquaredRadiusThreshold(radiusThreshold * radiusThreshold),
+ fDurationThreshold(durationThreshold)
{
if (durationThreshold == 0) {
get_click_speed(&fDurationThreshold);
############################################################################
Revision: hrev49350
Commit: 02ab820d0e26d680b9d158024b1cde1bc5ded6c0
URL: http://cgit.haiku-os.org/haiku/commit/?id=02ab820d0e26
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Thu Jul 2 02:18:11 2015 UTC
Backgrounds: FlattenedSize() can be negative (error status)
CID 610928.
----------------------------------------------------------------------------
diff --git a/src/preferences/backgrounds/BackgroundImage.cpp
b/src/preferences/backgrounds/BackgroundImage.cpp
index f5c9489..e0a8a44 100644
--- a/src/preferences/backgrounds/BackgroundImage.cpp
+++ b/src/preferences/backgrounds/BackgroundImage.cpp
@@ -494,7 +494,10 @@ BackgroundImage::SetBackgroundImage(BNode* node)
PRINT_OBJECT(container);
- size_t flattenedSize = container.FlattenedSize();
+ ssize_t flattenedSize = container.FlattenedSize();
+ if (flattenedSize < B_OK)
+ return flattenedSize;
+
char* buffer = new(std::nothrow) char[flattenedSize];
if (buffer == NULL)
return B_NO_MEMORY;
@@ -511,7 +514,7 @@ BackgroundImage::SetBackgroundImage(BNode* node)
if (size < B_OK)
return size;
- if ((size_t)size != flattenedSize)
+ if (size != flattenedSize)
return B_ERROR;
return B_OK;
