gobex: Replace g_convert by utf16_to_utf8
PATCH v2 1/1 gobex: Replace g_convert by utf16_to_utf8
g_lib may be built without the gconv modules for UTF-16, which prevent to use g_convert().
This commit replaces it by a function similar to the existing utf8_to_utf16() function.
---
v1 -> v2: Fix missing g_free
gobex/gobex-header.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-)
gobex/gobex-header.c +35 -6
@@ -62,6 +62,34 @@ static glong utf8_to_utf16(gunichar2 **utf16, const char *utf8) {return utf16_len; } +static glong utf16_to_utf8 (char **utf8,const gunichar2 *utf16,glong len, +GError **err) +{ +glong utf8_len; +int i; +gunichar2 *buf; + +if (*utf16 =='\0' ) { + *utf8 =NULL ; +return 0 ; + } + +/* OBEX requires network byteorder (big endian) UTF-16 +* but g_utf16_to_utf8 expects host-byteorder UTF-8 +*/ + buf =g_malloc0 (sizeof (gunichar2) * len); +for (i =0 ; i < len; i++) + (buf)[i] =g_ntohs (utf16[i]); + + *utf8 =g_utf16_to_utf8 (buf,-1 ,NULL , &utf8_len, err); +if (*utf8 ==NULL ) + utf8_len =-1 ; + +g_free (buf); + +return utf8_len; +} +static guint8 *put_bytes (guint8 *to,const void *from,gsize count) {memcpy (to, from, count);
@@ -130,7 +158,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len,GObexHeader *header;const guint8 *ptr = data;guint16 hdr_len; -gsize str_len; +glong str_len;GError *conv_err =NULL ;if (len <2 ) {
@@ -177,13 +205,14 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, goto failed; } - header->v.string =g_convert ((const char *) ptr, hdr_len -5 , -"UTF-8" ,"UTF-16BE" , -NULL , &str_len, &conv_err); -if (header->v.string ==NULL ) { + str_len =utf16_to_utf8 (&header->v.string, + (const gunichar2 *) ptr, + hdr_len -5 , + &conv_err); +if (str_len <0 ) {g_set_error (err,G_OBEX_ERROR ,G_OBEX_ERROR_PARSE_ERROR , -"Unicode conversion failed: %s" , +"UTF16 to UTF8 conversion failed: %s" , conv_err->message);g_error_free (conv_err); goto failed;
Signature · 1 line
2.34.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=886437
---Test result---
Test Summary:
CheckPatch PASS 0.50 seconds GitLint PASS 0.31 seconds BuildEll PASS 24.99 seconds BluezMake PASS 1764.69 seconds MakeCheck FAIL 12.86 seconds MakeDistcheck PASS 182.50 seconds CheckValgrind PASS 257.54 seconds CheckSmatch PASS 363.81 seconds bluezmakeextell PASS 122.14 seconds IncrementalBuild PASS 1524.38 seconds ScanBuild WARNING 1031.59 seconds
Details
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
make[3]: *** [Makefile:11766: test-suite.log] Error 1
make[2]: *** [Makefile:11874: check-TESTS] Error 2
make[1]: *** [Makefile:12303: check-am] Error 2
make: *** [Makefile:12305: check] Error 2
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:gobex/gobex-header.c:95:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull'
memcpy(to, from, count);
^~~~~~~~~~~~~~~~~~~~~~~1 warning generated.
---
Regards,
Linux Bluetooth