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

strncpy is trouble

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-15 14:52:39 -05:00
parent 44262405df
commit 7b86e28e00
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
os/files.c
View File

@ -76,14 +76,14 @@ loop:
return Yap_unify(ARG1, ARG3) && Yap_unify(ARG2, MkStringTerm("")); return Yap_unify(ARG1, ARG3) && Yap_unify(ARG2, MkStringTerm(""));
} }
tmp = malloc((ss - f) + 1); tmp = malloc((ss - f) + 1);
strncpy(tmp, f, (ss)-f); int i;
for (i=0;i < (ss - f); i++) tmp[i] = ss[i];
tmp[i] = '\0';
if (!Yap_unify(ARG1, MkStringTerm(tmp))) { if (!Yap_unify(ARG1, MkStringTerm(tmp))) {
if (tmp != f) free(tmp);
free(tmp);
return false; return false;
} }
if (tmp != f) free(tmp);
free(tmp);
// without and with dot // without and with dot
if (!Yap_unify(ARG2, MkStringTerm(ss + 1))) if (!Yap_unify(ARG2, MkStringTerm(ss + 1)))
return Yap_unify(ARG2, MkStringTerm(ss)); return Yap_unify(ARG2, MkStringTerm(ss));
@ -95,8 +95,10 @@ loop:
Yap_unify(ARG2, MkAtomTerm(Yap_LookupAtom(""))); Yap_unify(ARG2, MkAtomTerm(Yap_LookupAtom("")));
} }
tmp = malloc((ss - f) + 1); tmp = malloc((ss - f) + 1);
strncpy(tmp, f, (ss)-f); int i;
if (!Yap_unify(ARG1, MkAtomTerm(Yap_LookupAtom(tmp)))) { for (i=0;i < (ss - f); i++) tmp[i] = ss[i];
tmp[i] = '\0';
if (!Yap_unify(ARG1, MkAtomTerm(Yap_LookupAtom(tmp)))) {
if (tmp != f) if (tmp != f)
free(tmp); free(tmp);
return false; return false;