azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in C string conversion, remove excessive includes. (#1786)

Browse Source
This commit is contained in:
Nikolay Igotti
2018-07-10 08:51:12 +03:00
committed by GitHub
parent f4e29c88c5
commit 7e517ef6f1
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/KString.cpp
+1 -10
View File
@@ -13,16 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include <limits.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <iterator>
#include <string>
#include "Assert.h" #include "Assert.h"
#include "City.h" #include "City.h"
@@ -713,7 +704,7 @@ int iswlower_Konan(KChar ch) {
extern "C" { extern "C" {
OBJ_GETTER(CreateStringFromCString, const char* cstring) { OBJ_GETTER(CreateStringFromCString, const char* cstring) {
RETURN_RESULT_OF(utf8ToUtf16, cstring, strlen(cstring)); RETURN_RESULT_OF(utf8ToUtf16, cstring, cstring ? strlen(cstring) : 0);
} }
OBJ_GETTER(CreateStringFromUtf8, const char* utf8, uint32_t lengthBytes) { OBJ_GETTER(CreateStringFromUtf8, const char* utf8, uint32_t lengthBytes) {