diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ssh://ssh.dcc.fc.up.pt:31064/home/vsc/github/yap-6.3

Browse Source
This commit is contained in:
Vitor Santos Costa 2018-02-07 21:48:50 +00:00
commit 8d6654d4cf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/text.c
View File

@ -220,7 +220,7 @@ static void *codes2buf(Term t0, void *b0, bool *get_codes USES_REGS) {
size_t length = 0; size_t length = 0;
if (t == TermNil) { if (t == TermNil) {
st0 = malloc(4); st0 = Malloc(4);
st0[0] = 0; st0[0] = 0;
return st0; return st0;
} }
@ -522,6 +522,9 @@ static Term write_strings(unsigned char *s0, seq_tv_t *out USES_REGS) {
Term t = init_tstring(PASS_REGS1); Term t = init_tstring(PASS_REGS1);
LOCAL_TERM_ERROR(t, 2 * max); LOCAL_TERM_ERROR(t, 2 * max);
unsigned char *buf = buf_from_tstring(HR); unsigned char *buf = buf_from_tstring(HR);
if (max==0)
buf[0] = '\0';
else
strcpy((char *)buf, s); strcpy((char *)buf, s);
if (max + 1 < min) { if (max + 1 < min) {
LOCAL_TERM_ERROR(t, 2 * min); LOCAL_TERM_ERROR(t, 2 * min);
@ -845,10 +848,11 @@ bool Yap_CVT_Text(seq_tv_t *inp, seq_tv_t *out USES_REGS) {
// cnt++; // cnt++;
int l = push_text_stack(); int l = push_text_stack();
buf = Yap_readText(inp PASS_REGS); buf = Yap_readText(inp PASS_REGS);
if (!buf || buf[0] == '\0') { if (!buf) {
pop_text_stack(l); pop_text_stack(l);
return 0L; return 0L;
} }
if (buf[0]) {
size_t leng = strlen_utf8(buf); size_t leng = strlen_utf8(buf);
if (out->type & (YAP_STRING_NCHARS | YAP_STRING_TRUNC)) { if (out->type & (YAP_STRING_NCHARS | YAP_STRING_TRUNC)) {
if (out->max < leng) { if (out->max < leng) {
@ -877,7 +881,7 @@ bool Yap_CVT_Text(seq_tv_t *inp, seq_tv_t *out USES_REGS) {
} }
} }
} }
}
rc = write_Text(buf, out PASS_REGS); rc = write_Text(buf, out PASS_REGS);
/* fprintf(stderr, " -> "); /* fprintf(stderr, " -> ");
if (!rc) fprintf(stderr, "NULL"); if (!rc) fprintf(stderr, "NULL");