Changeset: d57999f73e2b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d57999f73e2b
Modified Files:
common/stream/stream.c
sql/test/mapi/Tests/utf8test.stable.out
Branch: Apr2019
Log Message:
Convert correct buffer after partial multibyte sequence failure.
diffs (32 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -3222,7 +3222,7 @@ static ssize_t
ic_write(stream *restrict s, const void *restrict buf, size_t elmsize, size_t
cnt)
{
struct icstream *ic = (struct icstream *) s->stream_data.p;
- ICONV_CONST char *inbuf = (ICONV_CONST char *) buf;
+ ICONV_CONST char *inbuf;
size_t inbytesleft = elmsize * cnt;
char *bf = NULL;
@@ -3243,6 +3243,7 @@ ic_write(stream *restrict s, const void
inbytesleft += ic->buflen;
ic->buflen = 0;
}
+ inbuf = (ICONV_CONST char *) buf;
while (inbytesleft > 0) {
char *outbuf = ic->buffer;
size_t outbytesleft = sizeof(ic->buffer);
diff --git a/sql/test/mapi/Tests/utf8test.stable.out
b/sql/test/mapi/Tests/utf8test.stable.out
--- a/sql/test/mapi/Tests/utf8test.stable.out
+++ b/sql/test/mapi/Tests/utf8test.stable.out
@@ -87,7 +87,7 @@ select * from utf8test
| s |
+==================================+
| value without special characters |
-|
+| funny characters:
#drop table utf8test
# 10:26:28 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
