Ensure zero-termination from PDC_wcstombs().

This commit is contained in:
William McBrine
2008-07-13 09:07:24 +00:00
parent 988eb7bec5
commit c8c0e539e6
2 changed files with 5 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
#include <curspriv.h>
RCSID("$Id: slk.c,v 1.59 2008/07/13 06:36:32 wmcbrine Exp $")
RCSID("$Id: slk.c,v 1.60 2008/07/13 09:07:24 wmcbrine Exp $")
/*man-start**************************************************************
@@ -284,7 +284,6 @@ char *slk_label(int labnum)
wchar_t *wtemp = slk_wlabel(labnum);
PDC_wcstombs(temp, wtemp, 32);
temp[32] = '\0';
#else
chtype *p;
int i;

View File

@@ -2,7 +2,7 @@
#include <curspriv.h>
RCSID("$Id: util.c,v 1.68 2008/07/13 06:36:32 wmcbrine Exp $")
RCSID("$Id: util.c,v 1.69 2008/07/13 09:07:24 wmcbrine Exp $")
/*man-start**************************************************************
@@ -308,7 +308,9 @@ size_t PDC_wcstombs(char *dest, const wchar_t *src, size_t n)
dest[i] = 0;
return i;
# else
return wcstombs(dest, src, n);
n = wcstombs(dest, src, n);
dest[n] = '\0';
return n;
# endif
}
#endif