diff options
| -rw-r--r-- | lib-src/ChangeLog | 8 | ||||
| -rw-r--r-- | lib-src/hexl.c | 8 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 13 | ||||
| -rw-r--r-- | lib-src/movemail.c | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 3 | ||||
| -rw-r--r-- | src/frame.c | 11 |
7 files changed, 40 insertions, 11 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 232bb389fd7..74509f4ae5e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,11 @@ +2011-01-23 Paul Eggert <eggert@cs.ucla.edu> + + Check return values of some library calls. + * hexl.c (main): Check fread result. + * make-docfile.c (main): Check chdir result. + (scan_c_file): Check fscanf result. + * movemail.c (main): Check ftruncate result. + 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> Include <unistd.h> unilaterally. diff --git a/lib-src/hexl.c b/lib-src/hexl.c index aa5b370aade..e0a5166760a 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -179,7 +179,9 @@ main (int argc, char **argv) #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10) - fread (buf, 1, 10, fp); /* skip 10 bytes */ + /* Skip 10 bytes. */ + if (fread (buf, 1, 10, fp) != 10) + break; for (i=0; i < 16; ++i) { @@ -207,7 +209,9 @@ main (int argc, char **argv) if (i < 16) break; - fread (buf, 1, 18, fp); /* skip 18 bytes */ + /* Skip 18 bytes. */ + if (fread (buf, 1, 18, fp) != 18) + break; } } } diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 4260e4c08f6..b6fccfacfec 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -158,7 +158,11 @@ main (int argc, char **argv) } if (argc > i + 1 && !strcmp (argv[i], "-d")) { - chdir (argv[i + 1]); + if (chdir (argv[i + 1]) != 0) + { + perror (argv[i + 1]); + return EXIT_FAILURE; + } i += 2; } @@ -648,6 +652,7 @@ scan_c_file (char *filename, const char *mode) if (defunflag && (commas == 1 || commas == 2)) { + int scanned = 0; do c = getc (infile); while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); @@ -655,12 +660,14 @@ scan_c_file (char *filename, const char *mode) goto eof; ungetc (c, infile); if (commas == 2) /* pick up minargs */ - fscanf (infile, "%d", &minargs); + scanned = fscanf (infile, "%d", &minargs); else /* pick up maxargs */ if (c == 'M' || c == 'U') /* MANY || UNEVALLED */ maxargs = -1; else - fscanf (infile, "%d", &maxargs); + scanned = fscanf (infile, "%d", &maxargs); + if (scanned < 0) + goto eof; } } diff --git a/lib-src/movemail.c b/lib-src/movemail.c index b127c85951d..f492188963d 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -488,7 +488,8 @@ main (int argc, char **argv) #ifdef MAIL_USE_SYSTEM_LOCK if (! preserve_mail) { - ftruncate (indesc, 0L); + if (ftruncate (indesc, 0L) != 0) + pfatal_with_name (inname); } #endif /* MAIL_USE_SYSTEM_LOCK */ diff --git a/src/ChangeLog b/src/ChangeLog index 06b9e313bd5..fbc1b2175b8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-01-23 Paul Eggert <eggert@cs.ucla.edu> + Check return values of some library calls. + * emacs.c (main): Check dup result. + * frame.c: Include <limits.h>, for INT_MIN and INT_MAX. + (frame_name_fnn_p): Check strtol result. + * image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash when calling XpmCreatePixmapFromData. diff --git a/src/emacs.c b/src/emacs.c index 70dd76d3a3b..9e9989ebbc6 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -912,13 +912,12 @@ main (int argc, char **argv) emacs_close (0); emacs_close (1); result = emacs_open (term, O_RDWR, 0); - if (result < 0) + if (result < 0 || dup (0) < 0) { char *errstring = strerror (errno); fprintf (stderr, "%s: %s: %s\n", argv[0], term, errstring); exit (1); } - dup (0); if (! isatty (0)) { fprintf (stderr, "%s: %s: not a tty\n", argv[0], term); diff --git a/src/frame.c b/src/frame.c index 5cbdcf15abf..e663538a840 100644 --- a/src/frame.c +++ b/src/frame.c @@ -23,6 +23,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <stdio.h> #include <ctype.h> +#include <errno.h> +#include <limits.h> #include <setjmp.h> #include "lisp.h" #include "character.h" @@ -2149,10 +2151,13 @@ frame_name_fnn_p (char *str, EMACS_INT len) if (len > 1 && str[0] == 'F') { char *end_ptr; + long int n; + errno = 0; + n = strtol (str + 1, &end_ptr, 10); - strtol (str + 1, &end_ptr, 10); - - if (end_ptr == str + len) + if (end_ptr == str + len + && INT_MIN <= n && n <= INT_MAX + && ((LONG_MIN < n && n < LONG_MAX) || errno != ERANGE)) return 1; } return 0; |