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

update len for wchar.

Browse Source 
SWI can release frame twice.
This commit is contained in:
Vitor Santos Costa 2010-07-28 10:45:37 +01:00
parent ca94b17049
commit 36a56ccd13
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/yap2swi/yap2swi.c
View File

@ -599,11 +599,15 @@ X_API int PL_get_wchars(term_t l, size_t *len, wchar_t **wsp, unsigned flags)
if (IsWideAtom(at)) { if (IsWideAtom(at)) {
/* will this always work? */ /* will this always work? */
*wsp = RepAtom(at)->WStrOfAE; *wsp = RepAtom(at)->WStrOfAE;
if (len)
*len = wcslen(RepAtom(at)->WStrOfAE);
} else { } else {
char *sp = RepAtom(at)->StrOfAE; char *sp = RepAtom(at)->StrOfAE;
size_t sz; size_t sz;
sz = strlen(sp); sz = strlen(sp);
if (len)
*len = sz;
if (flags & BUF_MALLOC) { if (flags & BUF_MALLOC) {
int i; int i;
wchar_t *nbf = (wchar_t *)YAP_AllocSpaceFromYap((sz+1)*sizeof(wchar_t)); wchar_t *nbf = (wchar_t *)YAP_AllocSpaceFromYap((sz+1)*sizeof(wchar_t));
@ -2589,6 +2593,7 @@ PL_open_foreign_frame(void)
X_API void X_API void
PL_close_foreign_frame(fid_t f) PL_close_foreign_frame(fid_t f)
{ {
execution = (open_query *)f;
CP = execution->cp; CP = execution->cp;
P = execution->p; P = execution->p;
CurSlot = execution->slots; CurSlot = execution->slots;
@ -2598,12 +2603,14 @@ PL_close_foreign_frame(fid_t f)
X_API void X_API void
PL_rewind_foreign_frame(fid_t f) PL_rewind_foreign_frame(fid_t f)
{ {
execution = (open_query *)f;
CurSlot = execution->slots; CurSlot = execution->slots;
} }
X_API void X_API void
PL_discard_foreign_frame(fid_t f) PL_discard_foreign_frame(fid_t f)
{ {
execution = (open_query *)f;
CP = execution->cp; CP = execution->cp;
P = execution->p; P = execution->p;
CurSlot = execution->slots; CurSlot = execution->slots;