Provide shim for libcutils strdup8to16/strdup16to8
Co-authored-by: Demon000 <demonsingur@gmail.com> Co-authored-by: Arian <arian.kulmer@web.de> Change-Id: Ic5d732f3e98ba45c886db9646d6ef30eb0d42bf4
This commit is contained in:
parent
aae0cea26d
commit
004fc53230
4 changed files with 395 additions and 0 deletions
12
Android.bp
12
Android.bp
|
@ -226,6 +226,18 @@ cc_defaults {
|
|||
srcs: ["libgui/gui_shim.cpp"],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libcutils_shim",
|
||||
shared_libs: [
|
||||
"libcutils",
|
||||
],
|
||||
srcs: [
|
||||
"libcutils/strdup16to8.cpp"
|
||||
"libcutils/strdup8to16.cpp"
|
||||
],
|
||||
vendor: true,
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libgui_shim",
|
||||
defaults: ["libgui_shim_defaults"],
|
||||
|
|
37
libcutils/jstring.h
Normal file
37
libcutils/jstring.h
Normal file
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* Copyright (C) 2006 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if __STDC_VERSION__ < 201112L && __cplusplus < 201103L
|
||||
typedef uint16_t char16_t;
|
||||
#endif
|
||||
// otherwise char16_t is a keyword with the right semantics
|
||||
|
||||
extern char * strndup16to8 (const char16_t* s, size_t n);
|
||||
extern size_t strnlen16to8 (const char16_t* s, size_t n);
|
||||
extern char * strncpy16to8 (char *dest, const char16_t*s, size_t n);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
168
libcutils/strdup16to8.cpp
Normal file
168
libcutils/strdup16to8.cpp
Normal file
|
@ -0,0 +1,168 @@
|
|||
/* libs/cutils/strdup16to8.c
|
||||
**
|
||||
** Copyright 2006, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
|
||||
#include "jstring.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <limits.h> /* for SIZE_MAX */
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
/**
|
||||
* Given a UTF-16 string, compute the length of the corresponding UTF-8
|
||||
* string in bytes.
|
||||
*/
|
||||
extern size_t strnlen16to8(const char16_t* utf16Str, size_t len)
|
||||
{
|
||||
size_t utf8Len = 0;
|
||||
|
||||
/* A small note on integer overflow. The result can
|
||||
* potentially be as big as 3*len, which will overflow
|
||||
* for len > SIZE_MAX/3.
|
||||
*
|
||||
* Moreover, the result of a strnlen16to8 is typically used
|
||||
* to allocate a destination buffer to strncpy16to8 which
|
||||
* requires one more byte to terminate the UTF-8 copy, and
|
||||
* this is generally done by careless users by incrementing
|
||||
* the result without checking for integer overflows, e.g.:
|
||||
*
|
||||
* dst = malloc(strnlen16to8(utf16,len)+1)
|
||||
*
|
||||
* Due to this, the following code will try to detect
|
||||
* overflows, and never return more than (SIZE_MAX-1)
|
||||
* when it detects one. A careless user will try to malloc
|
||||
* SIZE_MAX bytes, which will return NULL which can at least
|
||||
* be detected appropriately.
|
||||
*
|
||||
* As far as I know, this function is only used by strndup16(),
|
||||
* but better be safe than sorry.
|
||||
*/
|
||||
|
||||
/* Fast path for the usual case where 3*len is < SIZE_MAX-1.
|
||||
*/
|
||||
if (len < (SIZE_MAX-1)/3) {
|
||||
while (len != 0) {
|
||||
len--;
|
||||
unsigned int uic = *utf16Str++;
|
||||
|
||||
if (uic > 0x07ff)
|
||||
utf8Len += 3;
|
||||
else if (uic > 0x7f || uic == 0)
|
||||
utf8Len += 2;
|
||||
else
|
||||
utf8Len++;
|
||||
}
|
||||
return utf8Len;
|
||||
}
|
||||
|
||||
/* The slower but paranoid version */
|
||||
while (len != 0) {
|
||||
len--;
|
||||
unsigned int uic = *utf16Str++;
|
||||
size_t utf8Cur = utf8Len;
|
||||
|
||||
if (uic > 0x07ff)
|
||||
utf8Len += 3;
|
||||
else if (uic > 0x7f || uic == 0)
|
||||
utf8Len += 2;
|
||||
else
|
||||
utf8Len++;
|
||||
|
||||
if (utf8Len < utf8Cur) /* overflow detected */
|
||||
return SIZE_MAX-1;
|
||||
}
|
||||
|
||||
/* don't return SIZE_MAX to avoid common user bug */
|
||||
if (utf8Len == SIZE_MAX)
|
||||
utf8Len = SIZE_MAX-1;
|
||||
|
||||
return utf8Len;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Convert a Java-Style UTF-16 string + length to a JNI-Style UTF-8 string.
|
||||
*
|
||||
* This basically means: embedded \0's in the UTF-16 string are encoded
|
||||
* as "0xc0 0x80"
|
||||
*
|
||||
* Make sure you allocate "utf8Str" with the result of strlen16to8() + 1,
|
||||
* not just "len".
|
||||
*
|
||||
* Please note, a terminated \0 is always added, so your result will always
|
||||
* be "strlen16to8() + 1" bytes long.
|
||||
*/
|
||||
extern char* strncpy16to8(char* utf8Str, const char16_t* utf16Str, size_t len)
|
||||
{
|
||||
char* utf8cur = utf8Str;
|
||||
|
||||
/* Note on overflows: We assume the user did check the result of
|
||||
* strnlen16to8() properly or at a minimum checked the result of
|
||||
* its malloc(SIZE_MAX) in case of overflow.
|
||||
*/
|
||||
while (len != 0) {
|
||||
len--;
|
||||
unsigned int uic = *utf16Str++;
|
||||
|
||||
if (uic > 0x07ff) {
|
||||
*utf8cur++ = (uic >> 12) | 0xe0;
|
||||
*utf8cur++ = ((uic >> 6) & 0x3f) | 0x80;
|
||||
*utf8cur++ = (uic & 0x3f) | 0x80;
|
||||
} else if (uic > 0x7f || uic == 0) {
|
||||
*utf8cur++ = (uic >> 6) | 0xc0;
|
||||
*utf8cur++ = (uic & 0x3f) | 0x80;
|
||||
} else {
|
||||
*utf8cur++ = uic;
|
||||
|
||||
if (uic == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*utf8cur = '\0';
|
||||
|
||||
return utf8Str;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a UTF-16 string to UTF-8.
|
||||
*
|
||||
*/
|
||||
char * strndup16to8 (const char16_t* s, size_t n)
|
||||
{
|
||||
if (s == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size_t len = strnlen16to8(s, n);
|
||||
|
||||
/* We are paranoid, and we check for SIZE_MAX-1
|
||||
* too since it is an overflow value for our
|
||||
* strnlen16to8 implementation.
|
||||
*/
|
||||
if (len >= SIZE_MAX-1)
|
||||
return NULL;
|
||||
|
||||
char* ret = static_cast<char*>(malloc(len + 1));
|
||||
if (ret == NULL)
|
||||
return NULL;
|
||||
|
||||
strncpy16to8 (ret, s, n);
|
||||
|
||||
return ret;
|
||||
}
|
178
libcutils/strdup8to16.cpp
Normal file
178
libcutils/strdup8to16.cpp
Normal file
|
@ -0,0 +1,178 @@
|
|||
/* libs/cutils/strdup8to16.c
|
||||
**
|
||||
** Copyright 2006, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
|
||||
#include "jstring.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/* See http://www.unicode.org/reports/tr22/ for discussion
|
||||
* on invalid sequences
|
||||
*/
|
||||
|
||||
#define UTF16_REPLACEMENT_CHAR 0xfffd
|
||||
|
||||
/* Clever trick from Dianne that returns 1-4 depending on leading bit sequence*/
|
||||
#define UTF8_SEQ_LENGTH(ch) (((0xe5000000 >> (((ch) >> 3) & 0x1e)) & 3) + 1)
|
||||
|
||||
/* note: macro expands to multiple lines */
|
||||
#define UTF8_SHIFT_AND_MASK(unicode, byte) \
|
||||
(unicode)<<=6; (unicode) |= (0x3f & (byte));
|
||||
|
||||
#define UNICODE_UPPER_LIMIT 0x10fffd
|
||||
|
||||
/**
|
||||
* out_len is an out parameter (which may not be null) containing the
|
||||
* length of the UTF-16 string (which may contain embedded \0's)
|
||||
*/
|
||||
|
||||
extern char16_t * strdup8to16 (const char* s, size_t *out_len)
|
||||
{
|
||||
char16_t *ret;
|
||||
size_t len;
|
||||
|
||||
if (s == NULL) return NULL;
|
||||
|
||||
len = strlen8to16(s);
|
||||
|
||||
// fail on overflow
|
||||
if (len && SIZE_MAX/len < sizeof(char16_t))
|
||||
return NULL;
|
||||
|
||||
// no plus-one here. UTF-16 strings are not null terminated
|
||||
ret = (char16_t *) malloc (sizeof(char16_t) * len);
|
||||
|
||||
return strcpy8to16 (ret, s, out_len);
|
||||
}
|
||||
|
||||
/**
|
||||
* Like "strlen", but for strings encoded with Java's modified UTF-8.
|
||||
*
|
||||
* The value returned is the number of UTF-16 characters required
|
||||
* to represent this string.
|
||||
*/
|
||||
extern size_t strlen8to16 (const char* utf8Str)
|
||||
{
|
||||
size_t len = 0;
|
||||
int ic;
|
||||
int expected = 0;
|
||||
|
||||
while ((ic = *utf8Str++) != '\0') {
|
||||
/* bytes that start 0? or 11 are lead bytes and count as characters.*/
|
||||
/* bytes that start 10 are extention bytes and are not counted */
|
||||
|
||||
if ((ic & 0xc0) == 0x80) {
|
||||
/* count the 0x80 extention bytes. if we have more than
|
||||
* expected, then start counting them because strcpy8to16
|
||||
* will insert UTF16_REPLACEMENT_CHAR's
|
||||
*/
|
||||
expected--;
|
||||
if (expected < 0) {
|
||||
len++;
|
||||
}
|
||||
} else {
|
||||
len++;
|
||||
expected = UTF8_SEQ_LENGTH(ic) - 1;
|
||||
|
||||
/* this will result in a surrogate pair */
|
||||
if (expected == 3) {
|
||||
len++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Retrieve the next UTF-32 character from a UTF-8 string.
|
||||
*
|
||||
* Stops at inner \0's
|
||||
*
|
||||
* Returns UTF16_REPLACEMENT_CHAR if an invalid sequence is encountered
|
||||
*
|
||||
* Advances "*pUtf8Ptr" to the start of the next character.
|
||||
*/
|
||||
static inline uint32_t getUtf32FromUtf8(const char** pUtf8Ptr)
|
||||
{
|
||||
uint32_t ret;
|
||||
int seq_len;
|
||||
int i;
|
||||
|
||||
/* Mask for leader byte for lengths 1, 2, 3, and 4 respectively*/
|
||||
static const unsigned char leaderMask[4] = {0xff, 0x1f, 0x0f, 0x07};
|
||||
|
||||
/* Bytes that start with bits "10" are not leading characters. */
|
||||
if (((**pUtf8Ptr) & 0xc0) == 0x80) {
|
||||
(*pUtf8Ptr)++;
|
||||
return UTF16_REPLACEMENT_CHAR;
|
||||
}
|
||||
|
||||
/* note we tolerate invalid leader 11111xxx here */
|
||||
seq_len = UTF8_SEQ_LENGTH(**pUtf8Ptr);
|
||||
|
||||
ret = (**pUtf8Ptr) & leaderMask [seq_len - 1];
|
||||
|
||||
if (**pUtf8Ptr == '\0') return ret;
|
||||
|
||||
(*pUtf8Ptr)++;
|
||||
for (i = 1; i < seq_len ; i++, (*pUtf8Ptr)++) {
|
||||
if ((**pUtf8Ptr) == '\0') return UTF16_REPLACEMENT_CHAR;
|
||||
if (((**pUtf8Ptr) & 0xc0) != 0x80) return UTF16_REPLACEMENT_CHAR;
|
||||
|
||||
UTF8_SHIFT_AND_MASK(ret, **pUtf8Ptr);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* out_len is an out parameter (which may not be null) containing the
|
||||
* length of the UTF-16 string (which may contain embedded \0's)
|
||||
*/
|
||||
|
||||
extern char16_t * strcpy8to16 (char16_t *utf16Str, const char*utf8Str,
|
||||
size_t *out_len)
|
||||
{
|
||||
char16_t *dest = utf16Str;
|
||||
|
||||
while (*utf8Str != '\0') {
|
||||
uint32_t ret;
|
||||
|
||||
ret = getUtf32FromUtf8(&utf8Str);
|
||||
|
||||
if (ret <= 0xffff) {
|
||||
*dest++ = (char16_t) ret;
|
||||
} else if (ret <= UNICODE_UPPER_LIMIT) {
|
||||
/* Create surrogate pairs */
|
||||
/* See http://en.wikipedia.org/wiki/UTF-16/UCS-2#Method_for_code_points_in_Plane_1.2C_Plane_2 */
|
||||
|
||||
*dest++ = 0xd800 | ((ret - 0x10000) >> 10);
|
||||
*dest++ = 0xdc00 | ((ret - 0x10000) & 0x3ff);
|
||||
} else {
|
||||
*dest++ = UTF16_REPLACEMENT_CHAR;
|
||||
}
|
||||
}
|
||||
|
||||
*out_len = dest - utf16Str;
|
||||
|
||||
return utf16Str;
|
||||
}
|
Loading…
Reference in a new issue