Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e329055 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Fix fdsan error" am: 9e46d1c9 

am: f06aef87

Change-Id: I2d64af2edc4a7315b906d4e9603fa957e27a4a30
parents 862f38de f06aef87

cmds/installd/utils.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define DEBUG_XATTRS 0

#define DEBUG_XATTRS 0





using android::base::EndsWith;

using android::base::EndsWith;

using android::base::Fdopendir;

using android::base::StringPrintf;

using android::base::StringPrintf;

using android::base::unique_fd;

using android::base::unique_fd;
@@ -1036,7 +1037,7 @@ static bool collect_profiles(DIR* d, 
                continue;

                continue;

            }

            }





            DIR* subdir = fdopendir(subdir_fd);

            DIR* subdir = Fdopendir(std::move(subdir_fd));

            if (subdir == nullptr) {

            if (subdir == nullptr) {

                PLOG(WARNING) << "Could not open dir path " << local_path;

                PLOG(WARNING) << "Could not open dir path " << local_path;

                result = false;

                result = false;