# HG changeset patch # User goetz # Date 1469020068 -7200 # Node ID 1cf0d5abc5a93049a6b4e549db369ef54903b3c6 # Parent ce8600f2919ef473f792edc29edeaf69a95d000c 8161923: Fix two memory issues. diff --git a/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp --- a/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp +++ b/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp @@ -103,7 +103,7 @@ LEReferenceToArrayOf ligatureTable(stHeader, success, ligatureOffset, LE_UNBOUNDED_ARRAY); LigatureActionEntry action; le_int32 offset, i = 0, j = 0; - le_int32 stack[nComponents]; + le_int32 stack[nComponents + 1]; le_int16 mm = -1; LEReferenceToArrayOf componentTable(stHeader, success, componentOffset, LE_UNBOUNDED_ARRAY); diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp --- a/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp +++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp @@ -1132,7 +1132,7 @@ if (dwRet != IDOK) { /* if failure, cleanup and return failure */ - GlobalFree(pDevMode); + GlobalFree(*pDevMode); *pDevMode = NULL; return FALSE; }