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

fix_floats

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-04 10:24:32 -05:00
parent f5e560366c
commit b8045f1a39
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os/format.c
View File

@ -679,6 +679,7 @@ static Int doformat(volatile Term otail, volatile Term oargs,
case 'G': { case 'G': {
Float fl; Float fl;
char *ptr; char *ptr;
char fmt[32];
if (targ > tnum - 1) if (targ > tnum - 1)
goto do_format_control_sequence_error; goto do_format_control_sequence_error;
@ -698,11 +699,11 @@ static Int doformat(volatile Term otail, volatile Term oargs,
} }
if (!has_repeats) if (!has_repeats)
repeats = 6; repeats = 6;
tmp1[0] = '%'; fmt[0] = '%';
tmp1[1] = '.'; fmt[1] = '.';
ptr = tmp1 + 2; ptr = fmt + 2;
#if HAVE_SNPRINTF #if HAVE_SNPRINTF
snprintf(ptr, 256 - 5, "%d", repeats); snprintf(ptr, 31 - 5, "%d", repeats);
#else #else
sprintf(ptr, "%d", repeats); sprintf(ptr, "%d", repeats);
#endif #endif
@ -711,19 +712,14 @@ static Int doformat(volatile Term otail, volatile Term oargs,
ptr[0] = ch; ptr[0] = ch;
ptr[1] = '\0'; ptr[1] = '\0';
{ {
char *tmp2; unsigned char *uptr = (unsigned char *)tmp1;
if (!(tmp2 = Yap_AllocCodeSpace(repeats + 10))) {
goto do_type_int_error;
}
#if HAVE_SNPRINTF #if HAVE_SNPRINTF
snprintf(tmp2, repeats + 10, tmp1, fl); snprintf(tmp1, repeats + 10, fmt, fl);
#else #else
sprintf(tmp2, tmp1, fl); sprintf(tmp1, fmt, fl);
#endif #endif
ptr = tmp2; while ((uptr += get_utf8(uptr, -1, &ch)) && ch != 0)
while ((fptr += get_utf8(fptr, -1, &ch)) && ch != 0)
f_putc(sno, ch); f_putc(sno, ch);
Yap_FreeCodeSpace(tmp2);
} }
break; break;
case 'd': case 'd':