Bug 1421541 - Tweak GetCStringValue(). r=glandium draft
authorNicholas Nethercote <nnethercote@mozilla.com>
Wed, 29 Nov 2017 18:49:08 +1100
changeset 704981 01c8327784e356e71511eedea17d1d8e0d008776
parent 704980 fefb67f6e48ec83368b6170aba050883d512eb22
child 704982 0e074f279b9002d42ecdf64aa0127415adfaa241
push id91299
push usernnethercote@mozilla.com
push dateWed, 29 Nov 2017 08:10:36 +0000
reviewersglandium
bugs1421541
milestone59.0a1
Bug 1421541 - Tweak GetCStringValue(). r=glandium It's not possible for a string value to be nullptr. MozReview-Commit-ID: 13X28YObvwp
modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -396,32 +396,28 @@ public:
   }
 
   nsresult GetCStringValue(PrefValueKind aKind, nsACString& aResult)
   {
     if (!IsTypeString()) {
       return NS_ERROR_UNEXPECTED;
     }
 
-    const char* stringVal = nullptr;
     if (aKind == PrefValueKind::Default || IsLocked() || !mHasUserValue) {
       // Do we have a default?
       if (!mHasDefaultValue) {
         return NS_ERROR_UNEXPECTED;
       }
-      stringVal = mDefaultValue.mStringVal;
+      MOZ_ASSERT(mDefaultValue.mStringVal);
+      aResult = mDefaultValue.mStringVal;
     } else {
-      stringVal = mUserValue.mStringVal;
+      MOZ_ASSERT(mUserValue.mStringVal);
+      aResult = mUserValue.mStringVal;
     }
 
-    if (!stringVal) {
-      return NS_ERROR_UNEXPECTED;
-    }
-
-    aResult = stringVal;
     return NS_OK;
   }
 
   void ToDomPref(dom::Pref* aDomPref)
   {
     aDomPref->name() = mName;
 
     aDomPref->isLocked() = mIsLocked;