Skip to content

Commit c6eca59

Browse files
committed
Fix string freeing for raw property accessors.
1 parent 87d5cec commit c6eca59

File tree

8 files changed

+13
-11
lines changed

8 files changed

+13
-11
lines changed

ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6848,7 +6848,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
68486848
*/
68496849

68506850
public class func get_ldk_swift_bindings_version() -> String {
6851-
return "a40019c5c98393c3285b1ba17df174dd957149b2"
6851+
return "87d5cecf63ba461d2b11da3c7798ada0cd7f6c9e"
68526852
}
68536853

68546854
}

ci/LDKSwift/Sources/LDKSwift/bindings/options/APIError.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ APIError_clone(origPointer)
178178

179179

180180
public func getErr() -> String {
181-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err)
181+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err, deallocate: false)
182182
}
183183

184184

@@ -203,7 +203,7 @@ APIError_clone(origPointer)
203203

204204

205205
public func getErr() -> String {
206-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err)
206+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err, deallocate: false)
207207
}
208208

209209
public func getFeerate() -> UInt32 {
@@ -232,7 +232,7 @@ APIError_clone(origPointer)
232232

233233

234234
public func getErr() -> String {
235-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err)
235+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err, deallocate: false)
236236
}
237237

238238

@@ -257,7 +257,7 @@ APIError_clone(origPointer)
257257

258258

259259
public func getErr() -> String {
260-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err)
260+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err, deallocate: false)
261261
}
262262

263263

ci/LDKSwift/Sources/LDKSwift/bindings/options/ClosureReason.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ClosureReason_write(objPointer)
178178

179179

180180
public func getPeer_msg() -> String {
181-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.peer_msg)
181+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.peer_msg, deallocate: false)
182182
}
183183

184184

@@ -203,7 +203,7 @@ ClosureReason_write(objPointer)
203203

204204

205205
public func getErr() -> String {
206-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err)
206+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.err, deallocate: false)
207207
}
208208

209209

ci/LDKSwift/Sources/LDKSwift/bindings/options/ParseError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ extension Bindings {
8888
if self.cOpaqueStruct?.tag != LDKParseError_InvalidSliceLength {
8989
return nil
9090
}
91-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.invalid_slice_length)
91+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.invalid_slice_length, deallocate: false)
9292
}
9393

9494

ci/LDKSwift/Sources/LDKSwift/bindings/options/PaymentError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extension Bindings {
5656
if self.cOpaqueStruct?.tag != LDKPaymentError_Invoice {
5757
return nil
5858
}
59-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.invoice)
59+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.invoice, deallocate: false)
6060
}
6161

6262
public func getValueAsRouting() -> Bindings.LightningError? {

ci/LDKSwift/Sources/LDKSwift/bindings/results/Result_StringErrorZ.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extension Bindings {
5555

5656
public func getValue() -> String? {
5757
if self.cOpaqueStruct?.result_ok == true {
58-
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.contents.result.pointee)
58+
return Bindings.LDKStr_to_string(nativeType: self.cOpaqueStruct!.contents.result.pointee, deallocate: false)
5959
}
6060
return nil
6161
}

src/conversion_helper.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,8 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
566566
elif return_type_string == 'String':
567567
return_prefix = 'Bindings.LDKStr_to_string(nativeType: '
568568
return_suffix = ')'
569+
if is_raw_property_getter:
570+
return_suffix = ', deallocate: false)'
569571
# elif is_clone_method:
570572
# return_prefix = 'Self(pointer: ',
571573
# return_suffix = ')'

xcode/LDKFramework/DirectlyLinkedBindingsApp/ContentView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct ContentView: View {
2828
}
2929

3030
}, label: {
31-
Text("Hello World")
31+
Text("Test Polar Invoice Invoice Payment Flow")
3232
}).disabled(self.isRunningTestFlow)
3333

3434
if let simulation = self.multiPeerSimulation {

0 commit comments

Comments
 (0)