Bug 1473453 - Part 2: QuotaManager: disambiguate null check of bool pointer. r?janv draft
authorChris Peterson <cpeterson@mozilla.com>
Wed, 04 Jul 2018 14:46:51 -0700
changeset 814373 0de6b76c3614bb60408fce2236f98a0cae348bb1
parent 814372 b9e8b65d2db1ec517ee5bcc7a3a1aad95585433f
child 814374 870fbb28a158fc86ccb534fa58041cdf059a1e02
push id115173
push usercpeterson@mozilla.com
push dateThu, 05 Jul 2018 03:25:42 +0000
reviewersjanv
bugs1473453
milestone63.0a1
Bug 1473453 - Part 2: QuotaManager: disambiguate null check of bool pointer. r?janv Fix clang-tidy warning about bool pointers: [misc-bool-pointer-implicit-conversion] dom/quota/ActorsParent.cpp:4168:7: warning: dubious check of 'bool *' against 'nullptr', did you mean to dereference it? MozReview-Commit-ID: C6QdeJlf71C
dom/quota/ActorsParent.cpp
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -4142,17 +4142,17 @@ QuotaManager::GetDirectoryMetadata2WithR
 
 nsresult
 QuotaManager::GetDirectoryMetadata2(nsIFile* aDirectory,
                                     int64_t* aTimestamp,
                                     bool* aPersisted)
 {
   AssertIsOnIOThread();
   MOZ_ASSERT(aDirectory);
-  MOZ_ASSERT(aTimestamp || aPersisted);
+  MOZ_ASSERT(aTimestamp != nullptr || aPersisted != nullptr);
   MOZ_ASSERT(mStorageInitialized);
 
   nsCOMPtr<nsIBinaryInputStream> binaryStream;
   nsresult rv = GetBinaryInputStream(aDirectory,
                                      NS_LITERAL_STRING(METADATA_V2_FILE_NAME),
                                      getter_AddRefs(binaryStream));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -4160,27 +4160,27 @@ QuotaManager::GetDirectoryMetadata2(nsIF
 
   uint64_t timestamp;
   rv = binaryStream->Read64(&timestamp);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   bool persisted;
-  if (aPersisted) {
+  if (aPersisted != nullptr) {
     rv = binaryStream->ReadBoolean(&persisted);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
   }
 
-  if (aTimestamp) {
+  if (aTimestamp != nullptr) {
     *aTimestamp = timestamp;
   }
-  if (aPersisted) {
+  if (aPersisted != nullptr) {
     *aPersisted = persisted;
   }
   return NS_OK;
 }
 
 nsresult
 QuotaManager::GetDirectoryMetadata2WithRestore(nsIFile* aDirectory,
                                                bool aPersistent,