stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8039412: Stack overflow on Linux using DialogTypeSelection.NATIVE

Browse Source 
Reviewed-by: prr, rchamyal
This commit is contained in:
Prasanta Sadhukhan 2015-11-17 19:15:48 +03:00
parent 1e176777db
commit 73b1044258
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
View File

@ -740,7 +740,19 @@ public abstract class RasterPrinterJob extends PrinterJob {
}
updatePageAttributes(service, page);
PageFormat newPage = pageDialog(attributes);
PageFormat newPage = null;
DialogTypeSelection dts =
(DialogTypeSelection)attributes.get(DialogTypeSelection.class);
if (dts == DialogTypeSelection.NATIVE) {
// Remove DialogTypeSelection.NATIVE to prevent infinite loop in
// RasterPrinterJob.
attributes.remove(DialogTypeSelection.class);
newPage = pageDialog(attributes);
// restore attribute
attributes.add(DialogTypeSelection.NATIVE);
} else {
newPage = pageDialog(attributes);
}
if (newPage == null) {
return page;

53
jdk/test/java/awt/print/PrinterJob/PageDlgStackOverflowTest.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.awt.print.PrinterJob;
import javax.print.attribute.HashPrintRequestAttributeSet;
import javax.print.attribute.PrintRequestAttributeSet;
import javax.print.attribute.standard.DialogTypeSelection;
/**
* @test
* @bug 8039412
* @run main/manual PageDlgStackOverflowTest
* @summary Calling pageDialog() after printDialog with
* DialogTypeSelection.NATIVE should not result in StackOverflowError
*/
public class PageDlgStackOverflowTest {
public static void main(String args[]) {
PrinterJob job = PrinterJob.getPrinterJob();
if (job == null) {
return;
}
PrintRequestAttributeSet pSet =
new HashPrintRequestAttributeSet();
pSet.add(DialogTypeSelection.NATIVE);
job.printDialog(pSet);
try {
job.pageDialog(pSet);
} catch (StackOverflowError e) {
throw new RuntimeException("StackOverflowError is thrown");
}
}
}