Browse Source

fix aliasing violations in fgetpos/fsetpos

add a member of appropriate type to the fpos_t union so that accesses
are well-defined. use long long instead of off_t since off_t is not
always exposed in stdio.h and there's no namespace-clean alias for it.

access is still performed using pointer casts rather than by naming
the union member as a matter of style; to the extent possible, the
naming of fields in opaque types defined in the public headers is not
treated as an API contract with the implementation. access via the
pointer cast is valid as long as the union has a member of matching
type.
Rich Felker 7 years ago
parent
commit
2fae10f887
3 changed files with 3 additions and 2 deletions
  1. 1 0
      include/stdio.h
  2. 1 1
      src/stdio/fgetpos.c
  3. 1 1
      src/stdio/fsetpos.c

+ 1 - 0
include/stdio.h

@@ -49,6 +49,7 @@ extern "C" {
 
 typedef union _G_fpos64_t {
 	char __opaque[16];
+	long long __lldata;
 	double __align;
 } fpos_t;
 

+ 1 - 1
src/stdio/fgetpos.c

@@ -4,7 +4,7 @@ int fgetpos(FILE *restrict f, fpos_t *restrict pos)
 {
 	off_t off = __ftello(f);
 	if (off < 0) return -1;
-	*(off_t *)pos = off;
+	*(long long *)pos = off;
 	return 0;
 }
 

+ 1 - 1
src/stdio/fsetpos.c

@@ -2,7 +2,7 @@
 
 int fsetpos(FILE *f, const fpos_t *pos)
 {
-	return __fseeko(f, *(const off_t *)pos, SEEK_SET);
+	return __fseeko(f, *(const long long *)pos, SEEK_SET);
 }
 
 LFS64(fsetpos);