ExteranlAddress>>fromString: converts string to UTF-8 first

macta · May 1, 2024 · 1ab6d62 · 1ab6d62
1 parent fa9e2f8
commit 1ab6d62
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/ThreadedFFI-UFFI-Tests/TFUFFIDerivedTypeMarshallingTest.class.st b/src/ThreadedFFI-UFFI-Tests/TFUFFIDerivedTypeMarshallingTest.class.st
@@ -170,7 +170,7 @@ TFUFFIDerivedTypeMarshallingTest >> testMarshallingStringReturnValue [
 	| cString originalString returnedString |
 	[
 	originalString := 'áèïô å∫'.
-	cString := ExternalAddress fromString: originalString utf8Encoded asString.
+	cString := ExternalAddress fromString: originalString.
 	returnedString := self pointerToString: cString.
 	self assert: returnedString equals: originalString.
 	] ensure: [ cString free ]
@@ -182,7 +182,7 @@ TFUFFIDerivedTypeMarshallingTest >> testMarshallingStringReturnValueWithAlias [
 	| cString originalString returnedString |
 	[
 	originalString := 'áèïô å∫'.
-	cString := ExternalAddress fromString: originalString utf8Encoded asString.
+	cString := ExternalAddress fromString: originalString.
 	returnedString := self pointerToStringWithAlias: cString.
 	self assert: returnedString equals: originalString.
 	] ensure: [ cString free ]

diff --git a/src/ThreadedFFI/TFStringType.class.st b/src/ThreadedFFI/TFStringType.class.st
@@ -19,7 +19,7 @@ Class {
 TFStringType >> allocateString: aString [
 	| anExternalAddress |
 
-	anExternalAddress := (ExternalAddress fromString: aString utf8Encoded).
+	anExternalAddress := (ExternalAddress fromString: aString).
 	self allocatedStrings add: anExternalAddress.
 	^ anExternalAddress
 ]

diff --git a/src/UnifiedFFI/ByteArray.extension.st b/src/UnifiedFFI/ByteArray.extension.st
@@ -187,6 +187,7 @@ ByteArray >> utf8StringFromCString [
 ]
 
 { #category : '*UnifiedFFI' }
-ByteArray >> writeString: aString [
-	LibC memCopy: aString to: self size: aString size
+ByteArray >> writeString: aByteString [
+
+	LibC memCopy: aByteString to: self size: aByteString size
 ]
diff --git a/src/UnifiedFFI/ExternalAddress.extension.st b/src/UnifiedFFI/ExternalAddress.extension.st
@@ -189,12 +189,14 @@ ExternalAddress >> fromAddress: aNumber [
 
 { #category : '*UnifiedFFI' }
 ExternalAddress class >> fromString: aString [
-	| result |
+	| result utf8Encoded |
+
+	utf8Encoded := aString utf8Encoded. 
 
-	result := self allocate: aString size + 1.
+	result := self allocate: utf8Encoded size + 1.
 	(self assert: result isNotNil).
-	result writeString: aString.
-	result unsignedByteAt: aString size + 1 put: 0.
+	result writeString: utf8Encoded.
+	result unsignedByteAt: utf8Encoded size + 1 put: 0.
 	^ result
 ]