[haiku-commits] haiku: hrev50798 - build/jam/repositories/HaikuPorts src/kits/shared src/kits/tracker

  • From: pulkomandy@xxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 29 Dec 2016 11:50:18 +0100 (CET)

hrev50798 adds 3 changesets to branch 'master'
old head: b4896fbf3b3139d6e5fbff9d5c41aea345df3c10
new head: 05d0fc8ec3a05b962ab597a657dff8e6dd0dc9f7
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=05d0fc8ec3a0+%5Eb4896fbf3b31

----------------------------------------------------------------------------

b50d53dd19e4: NodePreloader.cpp: fix memory leak.
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  
  Fixes #13115.

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

682adeb3aa6a: IconButton.cpp: fix memory leak.
  
  Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  
  Ticket : #13127

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

05d0fc8ec3a0: Fix more packages depending on libpng.

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

3 files changed, 17 insertions(+), 15 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 | 20 ++++++++++----------
src/kits/shared/IconButton.cpp             |  8 ++++----
src/kits/tracker/NodePreloader.cpp         |  4 +++-

############################################################################

Commit:      b50d53dd19e47f7b98a4a63a469511cc669d12fa
URL:         http://cgit.haiku-os.org/haiku/commit/?id=b50d53dd19e4
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Dec 18 11:13:49 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Thu Dec 29 10:48:28 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/13115

NodePreloader.cpp: fix memory leak.

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

Fixes #13115.

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/NodePreloader.cpp 
b/src/kits/tracker/NodePreloader.cpp
index 8f2a189..ea93baf 100644
--- a/src/kits/tracker/NodePreloader.cpp
+++ b/src/kits/tracker/NodePreloader.cpp
@@ -57,8 +57,10 @@ NodePreloader::InstallNodePreloader(const char* name, 
BLooper* host)
        NodePreloader* result = new NodePreloader(name);
        {
                AutoLock<BLooper> lock(host);
-               if (!lock)
+               if (!lock) {
+                       delete result;
                        return NULL;
+               }
 
                host->AddHandler(result);
        }

############################################################################

Commit:      682adeb3aa6a3d38b245b94e821cecfa75a1c2a5
URL:         http://cgit.haiku-os.org/haiku/commit/?id=682adeb3aa6a
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Fri Dec 23 21:19:18 2016 UTC
Committer:   Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Thu Dec 29 10:48:28 2016 UTC

Ticket:      https://dev.haiku-os.org/ticket/13127

IconButton.cpp: fix memory leak.

Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

Ticket : #13127

----------------------------------------------------------------------------

diff --git a/src/kits/shared/IconButton.cpp b/src/kits/shared/IconButton.cpp
index 0000f1d..bcfb58a 100644
--- a/src/kits/shared/IconButton.cpp
+++ b/src/kits/shared/IconButton.cpp
@@ -448,9 +448,9 @@ BIconButton::SetIcon(const unsigned char* bitsFromQuickRes,
                                BBitmap* bitmap = new(std::nothrow) BBitmap(
                                        quickResBitmap->Bounds(), B_RGB32, 
true);
                                if (bitmap && bitmap->IsValid()) {
-                                       BView* helper = new 
BView(bitmap->Bounds(), "helper",
-                                               B_FOLLOW_NONE, B_WILL_DRAW);
                                        if (bitmap->Lock()) {
+                                               BView* helper = new 
BView(bitmap->Bounds(), "helper",
+                                                       B_FOLLOW_NONE, 
B_WILL_DRAW);
                                                bitmap->AddChild(helper);
                                                
helper->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
                                                
helper->FillRect(helper->Bounds());
@@ -664,9 +664,9 @@ BIconButton::_ConvertToRGB32(const BBitmap* bitmap) const
                B_BITMAP_ACCEPTS_VIEWS, B_RGBA32);
        if (convertedBitmap && convertedBitmap->IsValid()) {
                memset(convertedBitmap->Bits(), 0, 
convertedBitmap->BitsLength());
-               BView* helper = new BView(bitmap->Bounds(), "helper",
-                                                                 
B_FOLLOW_NONE, B_WILL_DRAW);
                if (convertedBitmap->Lock()) {
+                       BView* helper = new BView(bitmap->Bounds(), "helper",
+                               B_FOLLOW_NONE, B_WILL_DRAW);
                        convertedBitmap->AddChild(helper);
                        helper->SetDrawingMode(B_OP_OVER);
                        helper->DrawBitmap(bitmap, BPoint(0.0, 0.0));

############################################################################

Revision:    hrev50798
Commit:      05d0fc8ec3a05b962ab597a657dff8e6dd0dc9f7
URL:         http://cgit.haiku-os.org/haiku/commit/?id=05d0fc8ec3a0
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Thu Dec 29 10:44:06 2016 UTC

Fix more packages depending on libpng.

----------------------------------------------------------------------------

diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 6514d38..0358a65 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -146,8 +146,8 @@ RemotePackageRepository HaikuPorts
        fluidsynth-1.1.6-2
        fluidsynth_devel-1.1.6-2
        fontboy-0.9.7-3
-       fontconfig-2.12.1-1
-       fontconfig_devel-2.12.1-1
+       fontconfig-2.12.1-2
+       fontconfig_devel-2.12.1-2
        fossil-1.36-3
        freetype-2.7-1
        freetype_devel-2.7-1
@@ -671,8 +671,8 @@ RemotePackageRepository HaikuPorts
        fluidlite_x86_devel-1.0.0-1
        fluidsynth_x86-1.1.6-4
        fluidsynth_x86_devel-1.1.6-4
-       fontconfig_x86-2.12.1-1
-       fontconfig_x86_devel-2.12.1-1
+       fontconfig_x86-2.12.1-2
+       fontconfig_x86_devel-2.12.1-2
        freedroidrpg_x86-0.15.1-1
        freetype_x86-2.7-1
        freetype_x86_devel-2.7-1
@@ -730,8 +730,8 @@ RemotePackageRepository HaikuPorts
        jpeg_x86_devel-9b-2
        lame_x86-3.99.5-7
        lame_x86_devel-3.99.5-7
-       lcms_x86-2.7-1
-       lcms_x86_devel-2.7-1
+       lcms_x86-2.8-1
+       lcms_x86_devel-2.8-1
        libao_x86-1.2.0-1
        libao_x86_devel-1.2.0-1
        libart_lgpl_x86-2.3.21-1
@@ -836,8 +836,8 @@ RemotePackageRepository HaikuPorts
        libsigc++_x86_devel-2.4.1-1
        libsdl_x86-1.2.15-9
        libsdl_x86_devel-1.2.15-9
-       libsdl2_x86-2.0.1-3
-       libsdl2_x86_devel-2.0.1-3
+       libsdl2_x86-2.0.5-3
+       libsdl2_x86_devel-2.0.5-3
        libsndfile_x86-1.0.27-1
        libsndfile_x86_devel-1.0.27-1
        libsolv_x86-0.3.0_haiku_2014_12_22-1
@@ -926,8 +926,8 @@ RemotePackageRepository HaikuPorts
        openexr_x86_devel-2.2.0-1
        openjdk_x86-1.7.u80_b32-3
        openjdk_x86_devel-1.7.u80_b32-3
-       openjpeg_x86-2.1.0-2
-       openjpeg_x86_devel-2.1.0-2
+       openjpeg_x86-2.1.2-1
+       openjpeg_x86_devel-2.1.2-1
        openssl_x86-1.0.2g-1
        openssl_x86_devel-1.0.2g-1
        openttd_x86-1.3.3-1


Other related posts:

  • » [haiku-commits] haiku: hrev50798 - build/jam/repositories/HaikuPorts src/kits/shared src/kits/tracker - pulkomandy