mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
645f97ced4
This patches fixes multiples issues on open_{w}memstream reported on both BZ#18241 and BZ#20181: - failed fseek does not set errno. - negative offset in fseek fails even when resulting position is a valid one. - a flush after write if the current write position is not at the end of the stream currupt data. The main fix is on seek operation for memstream (_IO_{w}str_seekoff), where both _IO_read_ptr and _IO_read_end pointer are updated if a write operation has occured (similar to default file operations). Also, to calculate the offset on both read and write pointers, a temporary value is instead of updating the argument supplied value. Negative offset are valid if resulting internal pointer is within the range of _IO_{read,write}_base and _IO_{read,write}_end. Also POSIX states that a null or wide null shall be appended to the current buffer iff a write moves the position to a value larger than the current lenght. Current implementation appends a null or wide null regardless of this condition. This patch fixes it by removing the 'else' condition on _IO_{w}mem_sync. Checked on x86_64. [BZ #18241] [BZ #20181] * libio/Makefile (test): Add tst-memstream3 and tst-wmemstream3. * libio/memstream.c (_IO_mem_sync): Only append a null byte if write position is at the end the buffer. * libio/wmemstream.c (_IO_wmem_sync): Likewise. * libio/strops.c (_IO_str_switch_to_get_mode): New function. (_IO_str_seekoff): Set correct offset from negative displacement and set EINVAL for invalid ones. * libio/wstrops.c (enlarge_userbuf): Use correct function to calculate buffer length. (_IO_wstr_switch_to_get_mode): New function. (_IO_wstr_seekoff): Set correct offset from negative displacement and set EINVAL for invalid ones. * libio/tst-memstream3.c: New file. * libio/tst-wmemstream3.c: Likewise. * manual/examples/memstrm.c: Remove warning when priting size_t.
145 lines
4.2 KiB
C
145 lines
4.2 KiB
C
/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "libioP.h"
|
|
#include "strfile.h"
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
|
|
|
|
struct _IO_FILE_wmemstream
|
|
{
|
|
_IO_strfile _sf;
|
|
wchar_t **bufloc;
|
|
_IO_size_t *sizeloc;
|
|
};
|
|
|
|
|
|
static int _IO_wmem_sync (_IO_FILE* fp) __THROW;
|
|
static void _IO_wmem_finish (_IO_FILE* fp, int) __THROW;
|
|
|
|
|
|
static const struct _IO_jump_t _IO_wmem_jumps libio_vtable =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT (finish, _IO_wmem_finish),
|
|
JUMP_INIT (overflow, (_IO_overflow_t) _IO_wstr_overflow),
|
|
JUMP_INIT (underflow, (_IO_underflow_t) _IO_wstr_underflow),
|
|
JUMP_INIT (uflow, (_IO_underflow_t) _IO_wdefault_uflow),
|
|
JUMP_INIT (pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
|
|
JUMP_INIT (xsputn, _IO_wdefault_xsputn),
|
|
JUMP_INIT (xsgetn, _IO_wdefault_xsgetn),
|
|
JUMP_INIT (seekoff, _IO_wstr_seekoff),
|
|
JUMP_INIT (seekpos, _IO_default_seekpos),
|
|
JUMP_INIT (setbuf, _IO_default_setbuf),
|
|
JUMP_INIT (sync, _IO_wmem_sync),
|
|
JUMP_INIT (doallocate, _IO_wdefault_doallocate),
|
|
JUMP_INIT (read, _IO_default_read),
|
|
JUMP_INIT (write, _IO_default_write),
|
|
JUMP_INIT (seek, _IO_default_seek),
|
|
JUMP_INIT (close, _IO_default_close),
|
|
JUMP_INIT (stat, _IO_default_stat),
|
|
JUMP_INIT (showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT (imbue, _IO_default_imbue)
|
|
};
|
|
|
|
/* Open a stream that writes into a malloc'd buffer that is expanded as
|
|
necessary. *BUFLOC and *SIZELOC are updated with the buffer's location
|
|
and the number of characters written on fflush or fclose. */
|
|
_IO_FILE *
|
|
open_wmemstream (wchar_t **bufloc, _IO_size_t *sizeloc)
|
|
{
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_FILE_wmemstream fp;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
struct _IO_wide_data wd;
|
|
} *new_f;
|
|
wchar_t *buf;
|
|
|
|
new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
return NULL;
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f->fp._sf._sbf._f._lock = &new_f->lock;
|
|
#endif
|
|
|
|
buf = calloc (1, _IO_BUFSIZ);
|
|
if (buf == NULL)
|
|
{
|
|
free (new_f);
|
|
return NULL;
|
|
}
|
|
_IO_no_init (&new_f->fp._sf._sbf._f, 0, 0, &new_f->wd, &_IO_wmem_jumps);
|
|
_IO_fwide (&new_f->fp._sf._sbf._f, 1);
|
|
_IO_wstr_init_static (&new_f->fp._sf._sbf._f, buf,
|
|
_IO_BUFSIZ / sizeof (wchar_t), buf);
|
|
new_f->fp._sf._sbf._f._flags2 &= ~_IO_FLAGS2_USER_WBUF;
|
|
new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc;
|
|
new_f->fp._sf._s._free_buffer = (_IO_free_type) free;
|
|
|
|
new_f->fp.bufloc = bufloc;
|
|
new_f->fp.sizeloc = sizeloc;
|
|
|
|
return (_IO_FILE *) &new_f->fp._sf._sbf;
|
|
}
|
|
|
|
|
|
static int
|
|
_IO_wmem_sync (_IO_FILE *fp)
|
|
{
|
|
struct _IO_FILE_wmemstream *mp = (struct _IO_FILE_wmemstream *) fp;
|
|
|
|
if (fp->_wide_data->_IO_write_ptr == fp->_wide_data->_IO_write_end)
|
|
{
|
|
_IO_wstr_overflow (fp, '\0');
|
|
--fp->_wide_data->_IO_write_ptr;
|
|
}
|
|
|
|
*mp->bufloc = fp->_wide_data->_IO_write_base;
|
|
*mp->sizeloc = (fp->_wide_data->_IO_write_ptr
|
|
- fp->_wide_data->_IO_write_base);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void
|
|
_IO_wmem_finish (_IO_FILE *fp, int dummy)
|
|
{
|
|
struct _IO_FILE_wmemstream *mp = (struct _IO_FILE_wmemstream *) fp;
|
|
|
|
*mp->bufloc = (wchar_t *) realloc (fp->_wide_data->_IO_write_base,
|
|
(fp->_wide_data->_IO_write_ptr
|
|
- fp->_wide_data->_IO_write_base + 1)
|
|
* sizeof (wchar_t));
|
|
if (*mp->bufloc != NULL)
|
|
{
|
|
size_t len = (fp->_wide_data->_IO_write_ptr
|
|
- fp->_wide_data->_IO_write_base);
|
|
(*mp->bufloc)[len] = '\0';
|
|
*mp->sizeloc = len;
|
|
|
|
fp->_wide_data->_IO_buf_base = NULL;
|
|
}
|
|
|
|
_IO_wstr_finish (fp, 0);
|
|
}
|