-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix illegal access exceptions, when retrieving options for private li…
…brary interfaces with an instance field Since direct mapped classes may retrieve options for the first time, only when a callback is passed or returned, this could happen unexpectedly.
- Loading branch information
1 parent
3b47eff
commit 578220e
Showing
5 changed files
with
163 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
test/com/sun/jna/different_package/PrivateDirectCallbacksTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* Copyright (c) 2020 Florian Kistner, All Rights Reserved | ||
| * | ||
| * The contents of this file is dual-licensed under 2 | ||
| * alternative Open Source/Free licenses: LGPL 2.1 or later and | ||
| * Apache License 2.0. (starting with JNA version 4.0.0). | ||
| * | ||
| * You can freely decide which license you want to apply to | ||
| * the project. | ||
| * | ||
| * You may obtain a copy of the LGPL License at: | ||
| * | ||
| * http://www.gnu.org/licenses/licenses.html | ||
| * | ||
| * A copy is also included in the downloadable source code package | ||
| * containing JNA, in file "LGPL2.1". | ||
| * | ||
| * You may obtain a copy of the Apache License at: | ||
| * | ||
| * http://www.apache.org/licenses/ | ||
| * | ||
| * A copy is also included in the downloadable source code package | ||
| * containing JNA, in file "AL2.0". | ||
| */ | ||
| package com.sun.jna.different_package; | ||
|
|
||
| import com.sun.jna.*; | ||
| import junit.framework.TestCase; | ||
|
|
||
| public class PrivateDirectCallbacksTest extends TestCase { | ||
| private interface PrivateWithCallbackArgumentTestLibrary extends Library { | ||
| PrivateWithCallbackArgumentTestLibrary INSTANCE = new DirectPrivateWithCallbackArgumentTestLibrary(); | ||
|
|
||
| interface VoidCallback extends Callback { | ||
| void callback(); | ||
| } | ||
|
|
||
| void callVoidCallback(VoidCallback c); | ||
| } | ||
|
|
||
| private static class DirectPrivateWithCallbackArgumentTestLibrary implements PrivateWithCallbackArgumentTestLibrary { | ||
| @Override | ||
| public native void callVoidCallback(VoidCallback c); | ||
|
|
||
| static { | ||
| Native.register("testlib"); | ||
| } | ||
| } | ||
|
|
||
| public void testCallVoidCallback() { | ||
| final boolean[] called = {false}; | ||
| PrivateWithCallbackArgumentTestLibrary.VoidCallback cb = new PrivateWithCallbackArgumentTestLibrary.VoidCallback() { | ||
| @Override | ||
| public void callback() { | ||
| called[0] = true; | ||
| } | ||
| }; | ||
| PrivateWithCallbackArgumentTestLibrary.INSTANCE.callVoidCallback(cb); | ||
| assertTrue("Callback not called", called[0]); | ||
| } | ||
|
|
||
| private interface PrivateWithCallbackReturnTestLibrary extends Library { | ||
| PrivateWithCallbackReturnTestLibrary INSTANCE = new DirectPrivateWithCallbackReturnTestLibrary(); | ||
|
|
||
| interface Int32CallbackX extends Callback { | ||
| int callback(int arg); | ||
| } | ||
|
|
||
| Int32CallbackX returnCallback(); | ||
|
|
||
| Int32CallbackX returnCallbackArgument(Int32CallbackX cb); | ||
| } | ||
|
|
||
| private static class DirectPrivateWithCallbackReturnTestLibrary implements PrivateWithCallbackReturnTestLibrary { | ||
| @Override | ||
| public native Int32CallbackX returnCallback(); | ||
|
|
||
| @Override | ||
| public native Int32CallbackX returnCallbackArgument(Int32CallbackX cb); | ||
|
|
||
| static { | ||
| Native.register("testlib"); | ||
| } | ||
| } | ||
|
|
||
| public void testInvokeCallback() { | ||
| PrivateWithCallbackReturnTestLibrary.Int32CallbackX cb = PrivateWithCallbackReturnTestLibrary.INSTANCE.returnCallback(); | ||
| assertNotNull("Callback should not be null", cb); | ||
| assertEquals("Callback should be callable", 1, cb.callback(1)); | ||
|
|
||
| PrivateWithCallbackReturnTestLibrary.Int32CallbackX cb2 = new PrivateWithCallbackReturnTestLibrary.Int32CallbackX() { | ||
| @Override | ||
| public int callback(int arg) { | ||
| return 0; | ||
| } | ||
| }; | ||
| assertSame("Java callback should be looked up", | ||
| cb2, PrivateWithCallbackReturnTestLibrary.INSTANCE.returnCallbackArgument(cb2)); | ||
| assertSame("Existing native function wrapper should be reused", | ||
| cb, PrivateWithCallbackReturnTestLibrary.INSTANCE.returnCallbackArgument(cb)); | ||
| } | ||
|
|
||
| public static void main(java.lang.String[] argList) { | ||
| junit.textui.TestRunner.run(PrivateDirectCallbacksTest.class); | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
test/com/sun/jna/different_package/PrivateLibraryInfoTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* Copyright (c) 2020 Florian Kistner, All Rights Reserved | ||
| * | ||
| * The contents of this file is dual-licensed under 2 | ||
| * alternative Open Source/Free licenses: LGPL 2.1 or later and | ||
| * Apache License 2.0. (starting with JNA version 4.0.0). | ||
| * | ||
| * You can freely decide which license you want to apply to | ||
| * the project. | ||
| * | ||
| * You may obtain a copy of the LGPL License at: | ||
| * | ||
| * http://www.gnu.org/licenses/licenses.html | ||
| * | ||
| * A copy is also included in the downloadable source code package | ||
| * containing JNA, in file "LGPL2.1". | ||
| * | ||
| * You may obtain a copy of the Apache License at: | ||
| * | ||
| * http://www.apache.org/licenses/ | ||
| * | ||
| * A copy is also included in the downloadable source code package | ||
| * containing JNA, in file "AL2.0". | ||
| */ | ||
| package com.sun.jna.different_package; | ||
|
|
||
| import com.sun.jna.Callback; | ||
| import com.sun.jna.Library; | ||
| import com.sun.jna.Native; | ||
| import junit.framework.TestCase; | ||
|
|
||
| public class PrivateLibraryInfoTest extends TestCase { | ||
| private interface TestLibrary extends Library { | ||
| @SuppressWarnings("unused") | ||
| TestLibrary INSTANCE = new TestLibrary() { | ||
| }; | ||
|
|
||
| interface VoidCallback extends Callback { | ||
| void callback(); | ||
| } | ||
| } | ||
|
|
||
| public void testLibraryInfo() { | ||
| assertTrue(Native.getLibraryOptions(TestLibrary.class).containsKey(Library.OPTION_TYPE_MAPPER)); | ||
| } | ||
|
|
||
| public void testCallbackLibraryInfo() { | ||
| TestLibrary.VoidCallback cb = new TestLibrary.VoidCallback() { | ||
| @Override | ||
| public void callback() { | ||
| } | ||
| }; | ||
| assertTrue(Native.getLibraryOptions(cb.getClass()).containsKey(Library.OPTION_TYPE_MAPPER)); | ||
| } | ||
| } |