Bug 1441009: bonus: Don't read garbage in CanvasUtils. r?smaug draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sun, 25 Feb 2018 16:47:00 +0100
changeset 759536 eacc295858a3369b23d2f6bff739ce85503149d7
parent 759535 1fd395b15f5563e11fa31c647c4d29531659d94d
push id100379
push userbmo:emilio@crisal.io
push dateSun, 25 Feb 2018 15:50:38 +0000
reviewerssmaug
bugs1441009
milestone60.0a1
Bug 1441009: bonus: Don't read garbage in CanvasUtils. r?smaug While reading who did that, I also found this, which is just fantastic. MozReview-Commit-ID: BiboyvEt0St
dom/canvas/CanvasUtils.cpp
--- a/dom/canvas/CanvasUtils.cpp
+++ b/dom/canvas/CanvasUtils.cpp
@@ -68,18 +68,17 @@ bool IsImageExtractionAllowed(nsIDocumen
 
     // Get the document URI and its spec.
     nsIURI *docURI = aDocument->GetDocumentURI();
     nsCString docURISpec;
     docURI->GetSpec(docURISpec);
 
     // Allow local files to extract canvas data.
     bool isFileURL;
-    (void) docURI->SchemeIs("file", &isFileURL);
-    if (isFileURL) {
+    if (NS_SUCCEEDED(docURI->SchemeIs("file", &isFileURL)) && isFileURL) {
         return true;
     }
 
     // Get calling script file and line for logging.
     JS::AutoFilename scriptFile;
     unsigned scriptLine = 0;
     bool isScriptKnown = false;
     if (JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine)) {