Bug 1426996 - Use fallible assign in NS_EscapeAndFilterURL draft
authorValentin Gosu <valentin.gosu@gmail.com>
Tue, 26 Dec 2017 21:47:22 +0100
changeset 714604 7db00a12c718a6e91de734e3762fb23caca6ca93
parent 713607 cd50ddedbd7c4b4d976b4c290dcc1b1e20cdf66c
child 744627 995cd88b04d05e3c57ead49d95769e0114652b7e
push id93964
push uservalentin.gosu@gmail.com
push dateTue, 26 Dec 2017 20:48:00 +0000
bugs1426996
milestone59.0a1
Bug 1426996 - Use fallible assign in NS_EscapeAndFilterURL MozReview-Commit-ID: EKVeQb3cboU
xpcom/io/nsEscape.cpp
--- a/xpcom/io/nsEscape.cpp
+++ b/xpcom/io/nsEscape.cpp
@@ -441,17 +441,19 @@ NS_EscapeAndFilterURL(const nsACString& 
   bool appended = false;
   nsresult rv = T_EscapeURL(aStr.Data(), aStr.Length(), aFlags, aFilterMask, aResult, appended);
   if (NS_FAILED(rv)) {
     aResult.Truncate();
     return rv;
   }
 
   if (!appended) {
-    aResult = aStr;
+    if (!aResult.Assign(aStr, fallible)) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
   }
 
   return rv;
 }
 
 const nsAString&
 NS_EscapeURL(const nsAString& aStr, uint32_t aFlags, nsAString& aResult)
 {