Changeset a4454620 in git

Timestamp:

15/01/14 00:17:26 (6 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

a8638a6

Parents:

2adff93

git-author:

Olly Betts <olly@…> (15/01/14 00:15:58)

git-committer:

Olly Betts <olly@…> (15/01/14 00:17:26)

Message:

src/img.c,src/useful.h: Fix some glibc fortify source warnings.

Files:

• ChangeLog (modified) (1 diff)
• src/img.c (modified) (4 diffs)
• src/useful.h (modified) (3 diffs)

ChangeLog

@@ +1 @@
+Wed Jan 15 00:15:30 GMT 2014  Olly Betts <olly@survex.com>
+
+        * src/img.c,src/useful.h: Fix some glibc fortify source warnings.
+
 Wed Jan 15 00:13:27 GMT 2014  Olly Betts <olly@survex.com>
 

src/img.c

@@ -1460 +1460 @@
                   pimg->H = get32(pimg->fh) / 100.0;
                   pimg->V = get32(pimg->fh) / 100.0;
+                  if (feof(pimg->fh)) {
+                      img_errno = IMG_BADFORMAT;
+                      return img_BAD;
+                  }
+                  if (ferror(pimg->fh)) {
+                      img_errno = IMG_READERROR;
+                      return img_BAD;
+                  }
                   return img_ERROR_INFO;
               case 0x23: { /* v7+: Date range (long) */
@@ -1468 +1476 @@
                   int days1 = (int)getu16(pimg->fh);
                   int days2 = (int)getu16(pimg->fh);
+                  if (feof(pimg->fh)) {
+                      img_errno = IMG_BADFORMAT;
+                      return img_BAD;
+                  }
+                  if (ferror(pimg->fh)) {
+                      img_errno = IMG_READERROR;
+                      return img_BAD;
+                  }
 #if IMG_API_VERSION == 0
                   pimg->date1 = (days1 - 25567) * 86400;
@@ -1499 +1515 @@
                       pimg->u = get32(pimg->fh) / 100.0;
                       pimg->d = get32(pimg->fh) / 100.0;
+                  }
+                  if (feof(pimg->fh)) {
+                      img_errno = IMG_BADFORMAT;
+                      return img_BAD;
+                  }
+                  if (ferror(pimg->fh)) {
+                      img_errno = IMG_READERROR;
+                      return img_BAD;
                   }
                   if (pimg->survey_len) {
@@ -1520 +1544 @@
                   img_errno = IMG_BADFORMAT;
                   return img_BAD;
+          }
+          if (feof(pimg->fh)) {
+              img_errno = IMG_BADFORMAT;
+              return img_BAD;
+          }
+          if (ferror(pimg->fh)) {
+              img_errno = IMG_READERROR;
+              return img_BAD;
           }
           goto again3;

src/useful.h

@@ -1 +1 @@
 /* useful.h
  * Lots of oddments that come in handy generally
- * Copyright (C) 1993-2003,2004,2010,2011 Olly Betts
+ * Copyright (C) 1993-2003,2004,2010,2011,2014 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
@@ -123 +123 @@
 static inline int16_t get16(FILE *fh) {
     int16_t w;
-    fread(&w, 2, 1, fh);
+    if (fread(&w, 2, 1, fh) == 0) {
+        /* We check feof() and ferror() afterwards, so checking the return
+         * value achieves nothing, but we get a warning from glibc's
+         * _FORTIFY_SOURCE if we don't pretend to. */
+    }
     return w;
 }
@@ -129 +133 @@
 static inline int32_t get32(FILE *fh) {
     int32_t w;
-    fread(&w, 4, 1, fh);
+    if (fread(&w, 4, 1, fh) == 0) {
+        /* We check feof() and ferror() afterwards, so checking the return
+         * value achieves nothing, but we get a warning from glibc's
+         * _FORTIFY_SOURCE if we don't pretend to. */
+    }
     return w;
 }