ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fix ungetc on files with empty buffer.

This commit is contained in:
Piotr Caban 2014-06-26 12:29:54 +02:00 committed by Alexandre Julliard
parent f91f24f6e7
commit 1ae475dae8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msvcrt/file.c
View File

@ -4859,12 +4859,17 @@ int CDECL MSVCRT_printf_s(const char *format, ...)
*/
int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file)
{
if (c == MSVCRT_EOF)
if(!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EOF;
if (c == MSVCRT_EOF || !(file->_flag&MSVCRT__IOREAD ||
(file->_flag&MSVCRT__IORW && !(file->_flag&MSVCRT__IOWRT))))
return MSVCRT_EOF;
MSVCRT__lock_file(file);
if(file->_bufsiz == 0 && msvcrt_alloc_buffer(file))
if((!file->_bufsiz && msvcrt_alloc_buffer(file))
|| (!file->_cnt && file->_ptr==file->_base))
file->_ptr++;
if(file->_ptr>file->_base) {
file->_ptr--;
if(file->_flag & MSVCRT__IOSTRG) {
@ -4878,6 +4883,7 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file)
}
file->_cnt++;
MSVCRT_clearerr(file);
file->_flag |= MSVCRT__IOREAD;
MSVCRT__unlock_file(file);
return c;
}