Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 417351: (Linux only) Initialize nsDeviceContextSpecGTK member data to null, fixing crash in destructor when cancelling printing. r+sr=roc, a=blocking1.9+

Browse Source
This commit is contained in:
dholbert@cs.stanford.edu 2008-02-13 15:14:52 -08:00
parent c545189a81
commit b05af4d0c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widget/src/gtk2/nsDeviceContextSpecG.cpp
View File

@ -386,6 +386,8 @@ nsStringArray* GlobalPrinters::mGlobalPrinterList = nsnull;
nsDeviceContextSpecGTK::nsDeviceContextSpecGTK() nsDeviceContextSpecGTK::nsDeviceContextSpecGTK()
{ {
DO_PR_DEBUG_LOG(("nsDeviceContextSpecGTK::nsDeviceContextSpecGTK()\n")); DO_PR_DEBUG_LOG(("nsDeviceContextSpecGTK::nsDeviceContextSpecGTK()\n"));
mGtkPageSetup = nsnull;
mGtkPrintSettings = nsnull;
} }
nsDeviceContextSpecGTK::~nsDeviceContextSpecGTK() nsDeviceContextSpecGTK::~nsDeviceContextSpecGTK()
@ -394,12 +396,10 @@ nsDeviceContextSpecGTK::~nsDeviceContextSpecGTK()
if (mGtkPageSetup) { if (mGtkPageSetup) {
g_object_unref(mGtkPageSetup); g_object_unref(mGtkPageSetup);
mGtkPageSetup = NULL;
} }
if (mGtkPrintSettings) { if (mGtkPrintSettings) {
g_object_unref(mGtkPrintSettings); g_object_unref(mGtkPrintSettings);
mGtkPrintSettings = NULL;
} }
} }
@ -706,7 +706,7 @@ NS_IMETHODIMP nsDeviceContextSpecGTK::BeginDocument(PRUnichar * aTitle, PRUnicha
NS_IMETHODIMP nsDeviceContextSpecGTK::EndDocument() NS_IMETHODIMP nsDeviceContextSpecGTK::EndDocument()
{ {
if (mToPrinter) { if (mToPrinter) {
if (!gtk_print_job_set_source_file(mPrintJob, mSpoolName.get(), NULL)) if (!gtk_print_job_set_source_file(mPrintJob, mSpoolName.get(), nsnull))
return NS_ERROR_GFX_PRINTER_COULD_NOT_OPEN_FILE; return NS_ERROR_GFX_PRINTER_COULD_NOT_OPEN_FILE;
NS_ADDREF(mSpoolFile.get()); NS_ADDREF(mSpoolFile.get());