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

PL_get_chars does not play nice.

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-08-03 21:09:14 +01:00
parent 16341a3a0c
commit a89336a555
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/yap2swi/yap2swi.c
View File

@ -549,7 +549,8 @@ X_API int PL_get_chars(term_t l, char **sp, unsigned flags)
/* this is not enough!!! */ /* this is not enough!!! */
snprintf(*sp,BUF_SIZE,"%ls",RepAtom(at)->WStrOfAE); snprintf(*sp,BUF_SIZE,"%ls",RepAtom(at)->WStrOfAE);
} else { } else {
*sp = RepAtom(at)->StrOfAE; char *s = RepAtom(at)->StrOfAE;
strncpy(tmp,s,BUF_SIZE);
} }
} else if (IsNumTerm(t)) { } else if (IsNumTerm(t)) {
if (IsFloatTerm(t)) { if (IsFloatTerm(t)) {
@ -598,10 +599,12 @@ X_API int PL_get_chars(term_t l, char **sp, unsigned flags)
} }
} }
if (flags & BUF_MALLOC) { if (flags & BUF_MALLOC) {
char *nbf = YAP_AllocSpaceFromYap(strlen(tmp)+1); size_t sz = strlen(tmp);
if (nbf == NULL) char *nbf = YAP_AllocSpaceFromYap(sz+1);
if (!nbf)
return 0; return 0;
strncpy(nbf,tmp,BUF_SIZE); strncpy(nbf,tmp,sz+1);
free(tmp);
*sp = nbf; *sp = nbf;
} }
return 1; return 1;