55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From caceb5a9f5ec37b32b2996e2936f383b2490f29b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
Date: Thu, 7 Mar 2019 13:58:13 +0100
|
|
Subject: [PATCH] test: Hande return value type properly
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
t/xs.t test failed on big-endian. The return_value after ffi_call()
|
|
was always 0. Big endian systems have the least siginicant byte at the
|
|
end of a word and interpreting a signed char memory as an integer
|
|
must take that offset into account.
|
|
|
|
This was not the case of the t/xs.t where doublechaar() returned
|
|
unsigned char but return_value was of int type and thus libffi stored
|
|
the value at a wrong offset.
|
|
|
|
Moreover the libffi was not properly used because a storage size of a libffi
|
|
return value must always be at least sizeof(ffi_arg) large and that's
|
|
not true for an unsigned char variable.
|
|
|
|
This patch fixes it.
|
|
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
---
|
|
t/xs.t | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/t/xs.t b/t/xs.t
|
|
index 08914ce..085c736 100644
|
|
--- a/t/xs.t
|
|
+++ b/t/xs.t
|
|
@@ -31,15 +31,15 @@ test2(unsigned char input_value)
|
|
ffi_cif ffi_cif;
|
|
ffi_type *args[1];
|
|
void *values[1];
|
|
- unsigned char return_value;
|
|
+ ffi_arg return_value;
|
|
|
|
args[0] = &ffi_type_uint8;
|
|
|
|
- if(ffi_prep_cif(&ffi_cif, FFI_DEFAULT_ABI, 1, &ffi_type_uint8, args) == FFI_OK)
|
|
+ if(ffi_prep_cif(&ffi_cif, FFI_DEFAULT_ABI, 1, &ffi_type_uchar, args) == FFI_OK)
|
|
{
|
|
values[0] = &input_value;
|
|
ffi_call(&ffi_cif, FFI_FN(doublechaar), &return_value, values);
|
|
- return return_value;
|
|
+ return (int)(unsigned char)return_value;
|
|
}
|
|
return -1;
|
|
}
|
|
--
|
|
2.20.1
|
|
|