← Back to branch summary

~openjdk/openjdk/openjdk7

« back to all changes in this revision

Viewing changes to patches/openjdk-7u91-secwebrev-8129611-jdk.patch

  • Committer: Matthias Klose
  • Date: 2015-10-22 12:00:33 UTC
  • Revision ID: doko@ubuntu.com-20151022120033-9nk8twp82wx63tdg
openjdk-7 (7u85-2.6.1-6) unstable; urgency=high

  [ Tiago Stürmer Daitx ]
  * Security fixes
    - S8048030, CVE-2015-4734: Expectations should be consistent
    - S8068842, CVE-2015-4803: Better JAXP data handling
    - S8076339, CVE-2015-4903: Better handling of remote object invocation
    - S8076383, CVE-2015-4835: Better CORBA exception handling
    - S8076387, CVE-2015-4882: Better CORBA value handling
    - S8076392, CVE-2015-4881: Improve IIOPInputStream consistency
    - S8076413, CVE-2015-4883: Better JRMP message handling
    - S8078427, CVE-2015-4842: More supportive home environment
    - S8078440: Safer managed types
    - S8080541: More direct property handling
    - S8080688, CVE-2015-4860: Service for DGC services
    - S8081744, CVE-2015-4868: Clear out list corner case
    - S8081760: Better group dynamics
    - S8086092. CVE-2015-4840: More palette improvements
    - S8086733, CVE-2015-4893: Improve namespace handling
    - S8087350: Improve array conversions
    - S8103671, CVE-2015-4805: More objective stream classes
    - S8103675: Better Binary searches
    - S8129611: Accessbridge error handling improvement
    - S8130078, CVE-2015-4911: Document better processing
    - S8130185: More accessible access switch
    - S8130193, CVE-2015-4806: Improve HTTP connections
    - S8130864: Better server identity handling
    - S8130891, CVE-2015-4843: (bf) More direct buffering
    - S8131291, CVE-2015-4872: Perfect parameter patterning
    - S8132042, CVE-2015-4844: Preserve layout presentation
  * S6966259: Make PrincipalName and Realm immutable, required for S8048030
  * S8078822: 8068842 fix missed one new file
    PrimeNumberSequenceGenerator.java

  [ Matthias Klose ]
  * Re-enable the atk bridge for releases with a fixed atk bridge.
    Again closes: #797595.

 -- Matthias Klose <doko@ubuntu.com>  Thu, 22 Oct 2015 00:42:34 +0200

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/openjdk-7u91-secwebrev-8129611-jdk.patch
 
1
# HG changeset patch
 
2
# User ptbrunet
 
3
# Date 1435612356 18000
 
4
#      Mon Jun 29 16:12:36 2015 -0500
 
5
# Node ID 27f13c1de8a645ec76cee013a55ea0ea3443f5b5
 
6
# Parent  3e3a22acc5be4eb4b860b4b4c0080473f5605988
 
7
8129611: Accessbridge error handling improvement
 
8
Reviewed-by: prr, ahgross, asmotrak
 
9
Contributed-by: peter.brunet@oracle.com
 
10
 
 
11
diff --git a/src/windows/native/sun/bridge/AccessBridgeDebug.cpp b/src/windows/native/sun/bridge/AccessBridgeDebug.cpp
 
12
--- openjdk/jdk/src/windows/native/sun/bridge/AccessBridgeDebug.cpp
 
13
+++ openjdk/jdk/src/windows/native/sun/bridge/AccessBridgeDebug.cpp
 
14
@@ -36,39 +36,6 @@
 
15
 extern "C" {
 
16
 #endif
 
17
 
 
18
-/**
 
19
- * print a GetLastError message
 
20
- */
 
21
-char *printError(char *msg) {
 
22
-    LPVOID lpMsgBuf = NULL;
 
23
-    static char retbuf[256];
 
24
-
 
25
-    if (msg != NULL) {
 
26
-        strncpy((char *)retbuf, msg, sizeof(retbuf));
 
27
-    }
 
28
-    if (!FormatMessage(
 
29
-                       FORMAT_MESSAGE_ALLOCATE_BUFFER |
 
30
-                       FORMAT_MESSAGE_FROM_SYSTEM |
 
31
-                       FORMAT_MESSAGE_IGNORE_INSERTS,
 
32
-                       NULL,
 
33
-                       GetLastError(),
 
34
-                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
 
35
-                       (LPTSTR) &lpMsgBuf,
 
36
-                       0,
 
37
-                       NULL ))
 
38
-        {
 
39
-            PrintDebugString("  %s: FormatMessage failed", msg);
 
40
-        } else {
 
41
-            PrintDebugString("  %s: %s", msg, (char *)lpMsgBuf);
 
42
-        }
 
43
-    if (lpMsgBuf != NULL) {
 
44
-        strncat((char *)retbuf, ": ", sizeof(retbuf) - strlen(retbuf) - 1);
 
45
-        strncat((char *)retbuf, (char *)lpMsgBuf, sizeof(retbuf) - strlen(retbuf) - 1);
 
46
-    }
 
47
-    return (char *)retbuf;
 
48
-}
 
49
-
 
50
-
 
51
     /**
 
52
      * Send debugging info to the appropriate place
 
53
      */
 
54
diff --git a/src/windows/native/sun/bridge/AccessBridgeDebug.h b/src/windows/native/sun/bridge/AccessBridgeDebug.h
 
55
--- openjdk/jdk/src/windows/native/sun/bridge/AccessBridgeDebug.h
 
56
+++ openjdk/jdk/src/windows/native/sun/bridge/AccessBridgeDebug.h
 
57
@@ -49,7 +49,6 @@
 
58
 extern "C" {
 
59
 #endif
 
60
 
 
61
-    char *printError(char *msg);
 
62
     void PrintDebugString(char *msg, ...);
 
63
     void PrintJavaDebugString(char *msg, ...);
 
64
     void wPrintJavaDebugString(wchar_t *msg, ...);
 
65
diff --git a/src/windows/native/sun/bridge/WinAccessBridge.cpp b/src/windows/native/sun/bridge/WinAccessBridge.cpp
 
66
--- openjdk/jdk/src/windows/native/sun/bridge/WinAccessBridge.cpp
 
67
+++ openjdk/jdk/src/windows/native/sun/bridge/WinAccessBridge.cpp
 
68
@@ -262,34 +262,6 @@
 
69
     theWindowsAccessBridge = this;
 
70
     isVMInstanceChainInUse = false;
 
71
 
 
72
-
 
73
-    // notify the user if new JVMs are found
 
74
-    /*
 
75
-      newJVMs = (char **)malloc(MAX_NEW_JVMS_FOUND);
 
76
-      for (int i = 0; i < MAX_NEW_JVMS_FOUND; i++) {
 
77
-      newJVMs[i] = (char *)malloc(SHORT_STRING_SIZE);
 
78
-      newJVMs[i][0] = 0;
 
79
-      }
 
80
-
 
81
-      BOOL newJ2SEFound = findNewJVMs(J2SE_REG_PATH, newJVMs);
 
82
-      BOOL newJ2REFound = TRUE; // findNewJVMs(J2RE_REG_PATH, newJVMs);
 
83
-
 
84
-      if (newJ2SEFound || newJ2REFound) {
 
85
-
 
86
-      int result = DialogBox(windowsInstance,
 
87
-      "FOUNDNEWJVMDIALOG",
 
88
-      NULL,
 
89
-      (DLGPROC)newJVMFoundDialogProc);
 
90
-      if (result < 0) {
 
91
-      printError("DialogBox failed");
 
92
-      }
 
93
-
 
94
-      PrintDebugString("  FOUNDNEWJVMDIALOG: result = %d", result);
 
95
-
 
96
-      ShowWindow((HWND)result, SW_SHOW);
 
97
-      }
 
98
-    */
 
99
-
 
100
     ShowWindow(theDialogWindow, SW_SHOW);
 
101
 }
 
102