lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

libio: Use wmemset instead of __wmemset to avoid linknamespace issue

Browse Source 
If the wide string operations are pulled into the link, the
wmemset symbol can cause a linknamespace failure.
This commit is contained in:
Florian Weimer
2016-06-03 09:48:14 +02:00
parent 1c1e7fb658
commit cfac4de69c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libio/wstrops.c
View File

@ -111,7 +111,7 @@ _IO_wstr_overflow (_IO_FILE *fp, _IO_wint_t c)
fp->_wide_data->_IO_buf_base = NULL;
}
wmemset (new_buf + old_wblen, L'\0', new_size - old_wblen);
__wmemset (new_buf + old_wblen, L'\0', new_size - old_wblen);
_IO_wsetb (fp, new_buf, new_buf + new_size, 1);
fp->_wide_data->_IO_read_base =
@ -228,9 +228,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
new position. */
assert (offset >= oldend);
if (reading)
wmemset (wd->_IO_read_base + oldend, L'\0', offset - oldend);
__wmemset (wd->_IO_read_base + oldend, L'\0', offset - oldend);
else
wmemset (wd->_IO_write_base + oldend, L'\0', offset - oldend);
__wmemset (wd->_IO_write_base + oldend, L'\0', offset - oldend);
return 0;
}