Ticket #11934: 0002-Deskbar-Sanitize-the-usage-of-BMessage-especially-fo.patch

src/apps/deskbar/BarView.cpp

@@ -263 +263 @@
             // so that I can follow the common pathway
             // for adding icons to the tray
             int32 id;
-            AddItem(new BMessage(*message), B_DESKBAR_TRAY, &id);
+            if (AddItem(message, B_DESKBAR_TRAY, &id) == B_OK)
+                Looper()->DetachCurrentMessage();
             break;
         }
 

src/apps/deskbar/BarWindow.cpp

@@ -39 +39 @@
 #include <stdio.h>
 
 #include <Application.h>
+#include <AutoDeleter.h>
 #include <Catalog.h>
 #include <Directory.h>
 #include <FindDirectory.h>
@@ -516 +517 @@
     BMessage reply;
     status_t err = B_ERROR;
 
-    BMessage archivedView;
-    if (message->FindMessage("view", &archivedView) == B_OK) {
+    BMessage* archivedView = new BMessage();
+    ObjectDeleter<BMessage> deleter(archivedView);
+    if (message->FindMessage("view", archivedView) == B_OK) {
 #if SHELF_AWARE
         message->FindInt32("shelf", &shelf);
 #endif
-        BMessage* archive = new BMessage(archivedView);
-        err = fBarView->AddItem(archive, shelf, &id);
-        if (err < B_OK)
-            delete archive;
+        err = fBarView->AddItem(archivedView, shelf, &id);
+        if (err == B_OK) {
+            // Detach the deleter since AddReplicant is taking ownership
+            // on success. This should be changed on server side.
+            deleter.Detach();
+        }
     } else if (message->FindRef("addon", &ref) == B_OK) {
         BEntry entry(&ref);
         err = entry.InitCheck();

src/apps/deskbar/StatusView.cpp

@@ -337 +337 @@
             bool showDayOfWeek = fTime->ShowDayOfWeek();
             bool showTimeZone = fTime->ShowTimeZone();
 
-            BMessage* reply = new BMessage(kGetClockSettings);
-            reply->AddBool("showClock", showClock);
-            reply->AddBool("showSeconds", showSeconds);
-            reply->AddBool("showDayOfWeek", showDayOfWeek);
-            reply->AddBool("showTimeZone", showTimeZone);
-            message->SendReply(reply);
+            BMessage reply(kGetClockSettings);
+            reply.AddBool("showClock", showClock);
+            reply.AddBool("showSeconds", showSeconds);
+            reply.AddBool("showDayOfWeek", showDayOfWeek);
+            reply.AddBool("showTimeZone", showTimeZone);
+            message->SendReply(&reply);
             break;
         }
 
@@ -451 +451 @@
 
     // Send a message to Time preferences telling it to update
     BMessenger messenger("application/x-vnd.Haiku-Time");
-    BMessage* message = new BMessage(kShowHideTime);
-    message->AddBool("showClock", showClock);
-    messenger.SendMessage(message);
+    BMessage message(kShowHideTime);
+    message.AddBool("showClock", showClock);
+    messenger.SendMessage(&message);
 }
 
 
@@ -673 +673 @@
     view->Archive(data);
     delete view;
 
-    AddIcon(data, id, &ref);
-        // add the rep; adds info to list
+    // add the rep; adds info to list
+    if (AddIcon(data, id, &ref) != B_OK)
+        delete data;
 
     if (addToSettings) {
         fAddOnSettings.AddString(kReplicantPathField, path.Path());

src/apps/deskbar/TimeView.cpp

@@ -195 +195 @@
             be_roster->Launch("application/x-vnd.Haiku-Time");
             // tell Time preflet to switch to the clock tab
             BMessenger messenger("application/x-vnd.Haiku-Time");
-            BMessage* switchToClock = new BMessage('SlCk');
-            messenger.SendMessage(switchToClock);
+            BMessage switchToClock('SlCk');
+            messenger.SendMessage(&switchToClock);
             break;
         }
 

src/kits/interface/Shelf.cpp

@@ -16 +16 @@
 
 #include <pthread.h>
 
+#include <AutoDeleter.h>
 #include <AutoLock.h>
 #include <Beep.h>
 #include <Dragger.h>
@@ -1178 +1179 @@
                 genCount = 1;
 
             BMessage replicant;
-            BMessage *replmsg = NULL;
-            for (int32 i = 0; archive.FindMessage("replicant", i, &replicant) == B_OK; i++) {
+            for (int32 i = 0; archive.FindMessage("replicant", i, &replicant)
+                == B_OK; i++) {
                 BPoint point;
-                replmsg = new BMessage();
+                BMessage *replMsg = new BMessage();
+                ObjectDeleter<BMessage> deleter(replMsg);
                 replicant.FindPoint("position", &point);
-                replicant.FindMessage("message", replmsg);
-                AddReplicant(replmsg, point);
+                if (replicant.FindMessage("message", replMsg) == B_OK)
+                    if (AddReplicant(replMsg, point) == B_OK) {
+                        // Detach the deleter since AddReplicant is taking
+                        // ownership on success. In R2 API this should be
+                        // changed to take always ownership on the message.
+                        deleter.Detach();
+                    }
             }
         }
     }