Bug 1263503 - memory leak of filename into layout/printing/nsPrintEngine.cpp. r?mantaroh draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 11 Sep 2017 10:42:22 +0900
changeset 662096 7fbcd17cb7f1600645dfe882cdd770aa3ec246a8
parent 662089 a5f163da8a9be5d2e86138c57d59be69723b5457
child 730741 3df339b90ba7f6a19405974747159b2b1a98f9bc
push id78947
push userbmo:m_kato@ga2.so-net.ne.jp
push dateMon, 11 Sep 2017 01:45:03 +0000
reviewersmantaroh
bugs1263503
milestone57.0a1
Bug 1263503 - memory leak of filename into layout/printing/nsPrintEngine.cpp. r?mantaroh "fileNameStr = fileName;" will be fileNameStr.Assign(fileName), so this causes small memory leak. We should use Adopt, getter_copies, or AString parameter instead. MozReview-Commit-ID: 5VTgttj2LdK
layout/printing/nsPrintEngine.cpp
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -1842,19 +1842,17 @@ nsPrintEngine::SetupToPrintContent()
   }
 
   nsAutoString fileNameStr;
   // check to see if we are printing to a file
   bool isPrintToFile = false;
   printData->mPrintSettings->GetPrintToFile(&isPrintToFile);
   if (isPrintToFile) {
     // On some platforms The BeginDocument needs to know the name of the file.
-    char16_t* fileName = nullptr;
-    printData->mPrintSettings->GetToFileName(&fileName);
-    fileNameStr = fileName;
+    printData->mPrintSettings->GetToFileName(getter_Copies(fileNameStr));
   }
 
   nsAutoString docTitleStr;
   nsAutoString docURLStr;
   GetDisplayTitleAndURL(printData->mPrintObject, docTitleStr, docURLStr,
                         eDocTitleDefURLDoc);
 
   int32_t startPage = 1;