From bb600a65753aa34e7c41b59c3d5dcfdcd48bda4f Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Tue, 19 Feb 2019 07:22:06 +0100 Subject: [PATCH] Merge pull request #1014 from ailin-nemui/fix-be64 fix test on Big Endian 64bit, due to pointer size mismatch (cherry picked from commit 01ce66c684b66860b9c0dae04912d7cf3ebb9aeb) --- tests/fe-text/test-paste-join-multiline.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/fe-text/test-paste-join-multiline.c b/tests/fe-text/test-paste-join-multiline.c index 778e19e9..8a81a9fb 100644 --- a/tests/fe-text/test-paste-join-multiline.c +++ b/tests/fe-text/test-paste-join-multiline.c @@ -54,7 +54,12 @@ static void test_paste_join_multiline(const paste_join_multiline_test_case *test g_test_message("INPUT: \"%s\"", (t1 = g_strescape(test->input, NULL))); g_free(t1); - buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len); + { + glong buf_len; + buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, &buf_len); + buffer->len = buf_len; + } + paste_buffer_join_lines(buffer); resultstr = g_ucs4_to_utf8((unichar *) buffer->data, buffer->len, NULL, NULL, NULL);