Merge commit '365b9b17b6e6876f41dabaf3e3a63e293b0370e3' into pm27100-vc2010

2026-05-26 14:30:27 +00:00 · 2024-07-23 16:31:21 +08:00
parent 7f80d9a873 365b9b17b6
commit cddbb16195
352 changed files with 5133 additions and 2546 deletions
@@ -11208,7 +11208,7 @@ nsDocShell::ScrollToAnchor(nsACString& aCurHash, nsACString& aNewHash,
      rv = shell->GoToAnchor(NS_ConvertUTF8toUTF16(str), scroll,
                             nsIPresShell::SCROLL_SMOOTH_AUTO);
    }
-    nsMemory::Free(str);
+    free(str);

    // Above will fail if the anchor name is not UTF-8.  Need to
    // convert from document charset to unicode.