CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Gary Benson <gbenson> 06/06/20 11:36:23
Modified files:
. : ChangeLog
java/awt : Toolkit.java
gnu/java/awt/peer/gtk: GtkToolkit.java
gnu/java/awt/peer/qt: QtToolkit.java
Log message:
2006-06-20 Gary Benson <[EMAIL PROTECTED]>
* java/awt/Toolkit.java: Add security check.
* gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
* gnu/java/awt/peer/qt/QtToolkit.java: Likewise.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7880&r2=1.7881
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Toolkit.java?cvsroot=classpath&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java?cvsroot=classpath&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtToolkit.java?cvsroot=classpath&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7880
retrieving revision 1.7881
diff -u -b -r1.7880 -r1.7881
--- ChangeLog 20 Jun 2006 11:24:41 -0000 1.7880
+++ ChangeLog 20 Jun 2006 11:36:22 -0000 1.7881
@@ -1,3 +1,9 @@
+2006-06-20 Gary Benson <[EMAIL PROTECTED]>
+
+ * java/awt/Toolkit.java: Add security check.
+ * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
+ * gnu/java/awt/peer/qt/QtToolkit.java: Likewise.
+
2006-06-20 Raif S. Naffah <[EMAIL PROTECTED]>
* gnu/java/security/key/dss/DSSKey.java: Source formatting.
Index: java/awt/Toolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Toolkit.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- java/awt/Toolkit.java 15 May 2006 16:11:48 -0000 1.41
+++ java/awt/Toolkit.java 20 Jun 2006 11:36:23 -0000 1.42
@@ -695,6 +695,14 @@
public PrintJob getPrintJob(Frame frame, String title,
JobAttributes jobAttr, PageAttributes pageAttr)
{
+ // FIXME: it is possible this check may be removed
+ // if this method, when written, always delegates to
+ // getPrintJob(Frame, String, Properties).
+ SecurityManager sm;
+ sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPrintJobAccess();
+
return null;
}
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- gnu/java/awt/peer/gtk/GtkToolkit.java 5 Jun 2006 13:47:04 -0000
1.87
+++ gnu/java/awt/peer/gtk/GtkToolkit.java 20 Jun 2006 11:36:23 -0000
1.88
@@ -310,6 +310,11 @@
public PrintJob getPrintJob (Frame frame, String jobtitle, Properties props)
{
+ SecurityManager sm;
+ sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPrintJobAccess();
+
return null;
}
Index: gnu/java/awt/peer/qt/QtToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtToolkit.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/awt/peer/qt/QtToolkit.java 7 Jun 2006 22:00:01 -0000 1.6
+++ gnu/java/awt/peer/qt/QtToolkit.java 20 Jun 2006 11:36:23 -0000 1.7
@@ -402,6 +402,11 @@
String jobtitle,
Properties props)
{
+ SecurityManager sm;
+ sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPrintJobAccess();
+
throw new RuntimeException("Not implemented");
}
