[haiku-commits] haiku: hrev53430 - src/servers/registrar

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 30 Aug 2019 15:20:09 -0400 (EDT)

hrev53430 adds 1 changeset to branch 'master'
old head: e8f5d1ca66d8e190d2ba1669b9f01c2c58f32e5b
new head: df6cc9b5c923e79d19c96e84eaf755676691e4ed
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=df6cc9b5c923+%5Ee8f5d1ca66d8

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

df6cc9b5c923: BRoster: dereference symlinks when building RosterAppInfo
  
  Should fix #15313
  
  Change-Id: Ibd1d4f4195d794841ecddf3534177982cf894bcb
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/1803
  Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

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

Revision:    hrev53430
Commit:      df6cc9b5c923e79d19c96e84eaf755676691e4ed
URL:         https://git.haiku-os.org/haiku/commit/?id=df6cc9b5c923
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Fri Aug 30 19:03:07 2019 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 19:20:06 2019 UTC

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

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

1 file changed, 6 insertions(+), 1 deletion(-)
src/servers/registrar/RosterAppInfo.cpp | 7 ++++++-

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

diff --git a/src/servers/registrar/RosterAppInfo.cpp 
b/src/servers/registrar/RosterAppInfo.cpp
index 7e012a03ec..176c8a2fb1 100644
--- a/src/servers/registrar/RosterAppInfo.cpp
+++ b/src/servers/registrar/RosterAppInfo.cpp
@@ -10,6 +10,9 @@
 #include <new>
 #include <string.h>
 
+#include <Entry.h>
+#include <SupportDefs.h>
+
 
 using std::nothrow;
 
@@ -33,7 +36,9 @@ RosterAppInfo::Init(thread_id thread, team_id team, port_id 
port, uint32 flags,
        this->team = team;
        this->port = port;
        this->flags = flags;
-       this->ref = *ref;
+       BEntry entry(ref, true);
+       if (entry.GetRef(&this->ref) != B_OK)
+               this->ref = *ref;
        if (signature)
                strlcpy(this->signature, signature, B_MIME_TYPE_LENGTH);
        else


Other related posts:

  • » [haiku-commits] haiku: hrev53430 - src/servers/registrar - waddlesplash