FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libfortran/67527 (io.h sanitizer complains on 1 << 31)

Browse source 
PR libfortran/67527
	PR libfortran/67535
	PR libfortran/67536
	* io/io.h: Use unsigned values for 31-bit left shifts.
	* io/unix.c (buf_read): Do not call memcpy() with NULL pointer arg.
	* io/write.c (nml_write_obj): Likewise.

From-SVN: r227705
This commit is contained in:
Francois-Xavier Coudert 2015-09-12 12:05:44 +00:00 • committed by François-Xavier Coudert
parent 4e9da1551b
commit 76b88c5fc9
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libgfortran/ChangeLog
View file

@ -1,3 +1,12 @@
2015-09-12 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR libfortran/67527
PR libfortran/67535
PR libfortran/67536
* io/io.h: Use unsigned values for 31-bit left shifts.
* io/unix.c (buf_read): Do not call memcpy() with NULL pointer arg.
* io/write.c (nml_write_obj): Likewise.
2015-09-05 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/53379

4
libgfortran/io/io.h
View file

@ -311,7 +311,7 @@ st_parameter_filepos;
#define IOPARM_INQUIRE_HAS_WRITE (1 << 28)
#define IOPARM_INQUIRE_HAS_READWRITE (1 << 29)
#define IOPARM_INQUIRE_HAS_CONVERT (1 << 30)
#define IOPARM_INQUIRE_HAS_FLAGS2 (1 << 31)
#define IOPARM_INQUIRE_HAS_FLAGS2 (1u << 31)
#define IOPARM_INQUIRE_HAS_ASYNCHRONOUS (1 << 0)
#define IOPARM_INQUIRE_HAS_DECIMAL (1 << 1)
@ -380,7 +380,7 @@ st_parameter_inquire;
#define IOPARM_DT_HAS_SIGN (1 << 24)
#define IOPARM_DT_HAS_F2003 (1 << 25)
/* Internal use bit. */
#define IOPARM_DT_IONML_SET (1 << 31)
#define IOPARM_DT_IONML_SET (1u << 31)
typedef struct st_parameter_dt

8
libgfortran/io/unix.c
View file

@ -489,7 +489,13 @@ buf_read (unix_stream * s, void * buf, ssize_t nbyte)
/* Is the data we want in the buffer? */
if (s->logical_offset + nbyte <= s->buffer_offset + s->active
&& s->buffer_offset <= s->logical_offset)
memcpy (buf, s->buffer + (s->logical_offset - s->buffer_offset), nbyte);
{
/* When nbyte == 0, buf can be NULL which would lead to undefined
behavior if we called memcpy(). */
if (nbyte != 0)
memcpy (buf, s->buffer + (s->logical_offset - s->buffer_offset),
nbyte);
}
else
{
/* First copy the active bytes if applicable, then read the rest

3
libgfortran/io/write.c
View file

@ -1833,7 +1833,8 @@ nml_write_obj (st_parameter_dt *dtp, namelist_info * obj, index_type offset,
+ strlen (obj->var_name) + obj->var_rank * NML_DIGITS + 1;
ext_name = xmalloc (ext_name_len);
memcpy (ext_name, base_name, base_name_len);
if (base_name)
memcpy (ext_name, base_name, base_name_len);
clen = strlen (obj->var_name + base_var_name_len);
memcpy (ext_name + base_name_len,
obj->var_name + base_var_name_len, clen);