archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8013454: [parfait] Memory leak in jdk/src/windows/native/sun/windows/awt_Cursor.cpp

Browse source 
8012079: [parfait] possible null pointer dereference in jdk/src/windows/native/sun/windows/awt_Font.cpp

Reviewed-by: art, serb
This commit is contained in:
Petr Pchelko 2013-08-14 16:17:28 +04:00
parent d2e96c4350
commit 6a28f9e6fb
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
jdk/src/windows/native/sun/windows/awt_Cursor.cpp
View file

@ -391,9 +391,16 @@ Java_sun_awt_windows_WCustomCursor_createCursorIndirect(
DASSERT(hCursor);
AwtCursor::setPData(self, ptr_to_jlong(new AwtCursor(env, hCursor, self, xHotSpot,
yHotSpot, nW, nH, nSS, cols,
(BYTE *)andMaskPtr)));
try {
AwtCursor::setPData(self, ptr_to_jlong(new AwtCursor(env, hCursor, self, xHotSpot,
yHotSpot, nW, nH, nSS, cols,
(BYTE *)andMaskPtr)));
} catch (...) {
if (cols) {
delete[] cols;
}
throw;
}
CATCH_BAD_ALLOC;
}

5
jdk/src/windows/native/sun/windows/awt_Font.cpp
View file

@ -510,6 +510,11 @@ void AwtFont::LoadMetrics(JNIEnv *env, jobject fontMetrics)
jobject font = env->GetObjectField(fontMetrics, AwtFont::fontID);
AwtFont* awtFont = AwtFont::GetFont(env, font);
if (!awtFont) {
/* failed to get font */
return;
}
HDC hDC = ::GetDC(0);
DASSERT(hDC != NULL);