dnrops
/
swift-java-coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dev: fix missing JNI check after java call

This commit is contained in:
Andrew Druk 2019-01-21 19:52:34 +02:00
parent 0dd2f9bb4f
commit 51d1f2fae3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/JNICore+JavaCoder.swift
View File

@ -316,13 +316,20 @@ public extension JNICore {
} }
private func checkArgument<Result>(args: [jvalue], _ block: (_ argsPtr: UnsafePointer<jvalue>?) -> Result) -> Result { private func checkArgument<Result>(args: [jvalue], _ block: (_ argsPtr: UnsafePointer<jvalue>?) -> Result) -> Result {
var locals = [jobject]()
if args.count > 0 { if args.count > 0 {
var args = args var args = args
return withUnsafePointer(to: &args[0]) { argsPtr in return withUnsafePointer(to: &args[0]) { argsPtr in
defer {
_ = JNI.check(Void.self, &locals)
}
return block(argsPtr) return block(argsPtr)
} }
} }
else { else {
defer {
_ = JNI.check(Void.self, &locals)
}
return block(nil) return block(nil)
} }
} }
@ -353,8 +360,8 @@ public extension JNICore {
} }
private func checkArgumentAndWrap<Result>(args: [JNIArgumentProtocol], _ block: (_ argsPtr: UnsafePointer<jvalue>?) -> Result) -> Result { private func checkArgumentAndWrap<Result>(args: [JNIArgumentProtocol], _ block: (_ argsPtr: UnsafePointer<jvalue>?) -> Result) -> Result {
var locals = [jobject]()
if args.count > 0 { if args.count > 0 {
var locals = [jobject]()
var argsValues = args.map({ $0.value(locals: &locals) }) var argsValues = args.map({ $0.value(locals: &locals) })
return withUnsafePointer(to: &argsValues[0]) { argsPtr in return withUnsafePointer(to: &argsValues[0]) { argsPtr in
defer { defer {
@ -364,6 +371,9 @@ public extension JNICore {
} }
} }
else { else {
defer {
_ = JNI.check(Void.self, &locals)
}
return block(nil) return block(nil)
} }
} }