CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Gary Benson <gbenson> 06/06/21 08:06:29
Modified files:
. : ChangeLog
gnu/java/awt/peer/gtk: CairoGraphics2D.java
gnu/java/awt/peer/qt: QtGraphics.java
gnu/java/awt/java2d: AbstractGraphics2D.java
Log message:
2006-06-21 Gary Benson <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/CairoGraphics2D.java: Add security
check.
* gnu/java/awt/peer/qt/QtGraphics.java: Likewise.
* gnu/java/awt/java2d/AbstractGraphics2D.java: Likewise.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7888&r2=1.7889
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtGraphics.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java?cvsroot=classpath&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7888
retrieving revision 1.7889
diff -u -b -r1.7888 -r1.7889
--- ChangeLog 20 Jun 2006 21:46:37 -0000 1.7888
+++ ChangeLog 21 Jun 2006 08:06:28 -0000 1.7889
@@ -1,3 +1,9 @@
+2006-06-21 Gary Benson <[EMAIL PROTECTED]>
+
+ * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Add security check.
+ * gnu/java/awt/peer/qt/QtGraphics.java: Likewise.
+ * gnu/java/awt/java2d/AbstractGraphics2D.java: Likewise.
+
2006-06-20 Thomas Fitzsimmons <[EMAIL PROTECTED]>
* native/plugin/Makefile.am (libgcjwebplugin_la_CXXFLAGS): Define
Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java 20 Jun 2006 13:57:51 -0000
1.27
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java 21 Jun 2006 08:06:28 -0000
1.28
@@ -41,6 +41,7 @@
import gnu.java.awt.ClasspathToolkit;
import java.awt.AlphaComposite;
+import java.awt.AWTPermission;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
@@ -886,6 +887,12 @@
}
else
{
+ // FIXME: this check is only required "if this Graphics2D
+ // context is drawing to a Component on the display screen".
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(new AWTPermission("readDisplayPixels"));
+
// FIXME: implement general Composite support
throw new java.lang.UnsupportedOperationException();
}
Index: gnu/java/awt/peer/qt/QtGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtGraphics.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/java/awt/peer/qt/QtGraphics.java 23 Aug 2005 02:13:48 -0000
1.3
+++ gnu/java/awt/peer/qt/QtGraphics.java 21 Jun 2006 08:06:29 -0000
1.4
@@ -38,6 +38,7 @@
package gnu.java.awt.peer.qt;
import java.awt.AlphaComposite;
+import java.awt.AWTPermission;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
@@ -605,9 +606,17 @@
composite = comp;
}
else
+ {
+ // FIXME: this check is only required "if this Graphics2D
+ // context is drawing to a Component on the display screen".
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(new AWTPermission("readDisplayPixels"));
+
throw new UnsupportedOperationException("We don't support custom"+
" composites yet.");
}
+ }
public Composite getComposite()
{
Index: gnu/java/awt/java2d/AbstractGraphics2D.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/java/awt/java2d/AbstractGraphics2D.java 9 Jun 2006 20:49:51 -0000
1.9
+++ gnu/java/awt/java2d/AbstractGraphics2D.java 21 Jun 2006 08:06:29 -0000
1.10
@@ -39,6 +39,7 @@
import java.awt.AWTError;
import java.awt.AlphaComposite;
+import java.awt.AWTPermission;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
@@ -539,6 +540,15 @@
*/
public void setComposite(Composite comp)
{
+ if (! (comp instanceof AlphaComposite))
+ {
+ // FIXME: this check is only required "if this Graphics2D
+ // context is drawing to a Component on the display screen".
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkPermission(new AWTPermission("readDisplayPixels"));
+ }
+
composite = comp;
if (! (comp.equals(AlphaComposite.SrcOver)))
isOptimized = false;
