summaryrefslogtreecommitdiff
path: root/java/openjdk6/files/icedtea/security/20130201/6563318.patch
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk6/files/icedtea/security/20130201/6563318.patch')
-rw-r--r--java/openjdk6/files/icedtea/security/20130201/6563318.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/java/openjdk6/files/icedtea/security/20130201/6563318.patch b/java/openjdk6/files/icedtea/security/20130201/6563318.patch
new file mode 100644
index 000000000000..8935ed6666c8
--- /dev/null
+++ b/java/openjdk6/files/icedtea/security/20130201/6563318.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User coffeys
+# Date 1355323250 0
+# Node ID 0da6d4cbcc77b3326756b52e6086b1262d52c214
+# Parent 042882b32f75d0e736c19f93688d37fb98d7d26d
+6563318: RMI data sanitization
+Reviewed-by: dmocek
+
+diff --git a/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
+--- jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
++++ jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2012, 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
+@@ -150,7 +150,7 @@ public final class CGIHandler {
+ returnServerError(e.getMessage());
+ }
+ else
+- returnClientError("invalid command: " + command);
++ returnClientError("Invalid command.");
+ } catch (Exception e) {
+ returnServerError("internal error: " + e.getMessage());
+ }
+@@ -217,7 +217,7 @@ final class CGIForwardCommand implements
+ try {
+ port = Integer.parseInt(param);
+ } catch (NumberFormatException e) {
+- throw new CGIClientException("invalid port number: " + param);
++ throw new CGIClientException("invalid port number.");
+ }
+ if (port <= 0 || port > 0xFFFF)
+ throw new CGIClientException("invalid port: " + port);