[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] haiku: hrev45916 - src/kits/storage
From:       ingo_weinhold () gmx ! de
Date:       2013-07-28 14:22:26
Message-ID: 20130728142226.87E675C0B03 () vmrepo ! haiku-os ! org
[Download RAW message or body]

hrev45916 adds 1 changeset to branch 'master'
old head: 0aea921993d99c92ba8bc8fc09bf09b334baa83b
new head: 7f98c6653ea4673eeb85431698dec09d0f3d4409
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7f98c66+%5E0aea921

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

7f98c66: Fix double free
  
  Signed-off-by: Ingo Weinhold <ingo_weinhold@gmx.de>

                                      [ Murai Takashi <tmurai01@gmail.com> ]

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

Revision:    hrev45916
Commit:      7f98c6653ea4673eeb85431698dec09d0f3d4409
URL:         http://cgit.haiku-os.org/haiku/commit/?id=7f98c66
Author:      Murai Takashi <tmurai01@gmail.com>
Date:        Sun Jul 28 00:24:49 2013 UTC
Committer:   Ingo Weinhold <ingo_weinhold@gmx.de>
Commit-Date: Sun Jul 28 14:22:13 2013 UTC

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

1 file changed, 3 insertions(+), 2 deletions(-)
src/kits/storage/Mime.cpp | 5 +++--

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

diff --git a/src/kits/storage/Mime.cpp b/src/kits/storage/Mime.cpp
index 8058be2..d89e6f5 100644
--- a/src/kits/storage/Mime.cpp
+++ b/src/kits/storage/Mime.cpp
@@ -311,10 +311,11 @@ get_named_icon(const char* name, BBitmap* icon, icon_size which)
 	size_t size;
 	type_code type;
 	status_t status = get_named_icon(name, &data, &size, &type);
-	if (status == B_OK)
+	if (status == B_OK) {
 		status = BIconUtils::GetVectorIcon(data, size, icon);
+		delete[] data;
+	}
 
-	delete[] data;
 	return status;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]