Attachment 28895 Details for Bug 53050 – 2012-06-05_tc55_53050_ManagerBase.patch

[patch] 2012-06-05_tc55_53050_ManagerBase.patch

2012-06-05_tc55_53050_ManagerBase.patch (text/plain), 1.43 KB, created by Konstantin Kolinko on 2012-06-05 20:43:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2012-06-05 20:43:09 UTC

Size: 1.43 KB

patch

obsolete

>Index: container/catalina/src/share/org/apache/catalina/session/ManagerBase.java
>===================================================================
>--- container/catalina/src/share/org/apache/catalina/session/ManagerBase.java	(revision 1346371)
>+++ container/catalina/src/share/org/apache/catalina/session/ManagerBase.java	(working copy)
>@@ -25,6 +25,7 @@
> import java.io.File;
> import java.io.FileInputStream;
> import java.io.IOException;
>+import java.io.UnsupportedEncodingException;
> import java.lang.reflect.Method;
> import java.security.AccessController;
> import java.security.MessageDigest;
>@@ -396,7 +397,12 @@
>                 // Ignore
>             }
>             if (apr) {
>-                setEntropy(new String(result));
>+                try {
>+                    setEntropy(new String(result, "ISO-8859-1"));
>+                } catch (UnsupportedEncodingException ux) {
>+                    // ISO-8859-1 should always be supported
>+                    throw new Error(ux);
>+                }
>             } else {
>                 setEntropy(this.toString());
>             }
>@@ -561,7 +567,7 @@
>             long t1 = seed;
>             char entropy[] = getEntropy().toCharArray();
>             for (int i = 0; i < entropy.length; i++) {
>-                long update = ((byte) entropy[i]) << ((i % 8) * 8);
>+                long update = ((long) entropy[i]) << ((i % 8) * 8);
>                 seed ^= update;
>             }
>             try {

Actions: View | Diff

Attachments on bug 53050: 28894 | 28895