diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2012-04-03 20:59:11 +0200 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2012-04-03 20:59:11 +0200 |
| commit | 9ca9b657e4f1d9481cc795422d74274abf9d41f1 (patch) | |
| tree | 58d3f14094bcff5bc8c08c588f2e3931f9222578 | |
| parent | 1207c7b6416084624aeeb78ba8222d9a4ca49d94 (diff) | |
| download | rockbox-9ca9b657e4f1d9481cc795422d74274abf9d41f1.zip rockbox-9ca9b657e4f1d9481cc795422d74274abf9d41f1.tar.gz rockbox-9ca9b657e4f1d9481cc795422d74274abf9d41f1.tar.bz2 rockbox-9ca9b657e4f1d9481cc795422d74274abf9d41f1.tar.xz | |
Revert 1207c7b and fix the actual warnings.
The warnings 1207c7b was supposed to get rid of are sim-only. This
means the binsize argument used for the _FORTIFY_SOURCE fix did not
apply at all. This one actually checks the return values.
Change-Id: Ic4cd8c25de4305310baa868c077a66981cdfcb4b
| -rw-r--r-- | firmware/target/hosted/sdl/lcd-charcells.c | 12 | ||||
| -rwxr-xr-x | tools/configure | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/lcd-charcells.c b/firmware/target/hosted/sdl/lcd-charcells.c index 9ceb5de..3a62382 100644 --- a/firmware/target/hosted/sdl/lcd-charcells.c +++ b/firmware/target/hosted/sdl/lcd-charcells.c @@ -167,7 +167,11 @@ void screen_dump(void) if (fd < 0) return; - write(fd, bmpheader, sizeof(bmpheader)); + if(write(fd, bmpheader, sizeof(bmpheader)) != sizeof(bmpheader)) + { + close(fd); + return; + } SDL_LockSurface(lcd_surface); /* BMP image goes bottom up */ @@ -191,7 +195,11 @@ void screen_dump(void) dst_mask = 0x80; } } - write(fd, line, sizeof(line)); + if(write(fd, line, sizeof(line)) != sizeof(line)) + { + close(fd); + return; + } } SDL_UnlockSurface(lcd_surface); close(fd); diff --git a/tools/configure b/tools/configure index ed3f0a4..b682cbd 100755 --- a/tools/configure +++ b/tools/configure @@ -3827,8 +3827,6 @@ if test -n "$t_cpu"; then elif [ "$simulator" = "yes" ]; then # a few more includes for the sim target tree TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted" - #disable _FORTIFY_SOURCE for simulator builds - GCCOPTS="$GCCOPTS -U_FORTIFY_SOURCE" fi TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer" |