[Xfce4-commits] [apps/orage] 01/01: 4.11.2.14 Coverity fix 31701, 31702 and 31703 ignoring number of bytes read

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

juha pushed a commit to branch master
in repository apps/orage.

commit 93e3aa8adee64fbad8904967efd03789d481486d
Author: Juha Kautto <juha at xfce.org>
Date:   Fri Mar 6 15:46:21 2015 +0200

    4.11.2.14 Coverity fix 31701, 31702 and 31703 ignoring number of bytes read
    
    Added better check for fread return count
---
 configure.in.in        |    2 +-
 src/tz_zoneinfo_read.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 5c59d97..921c171 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.11.2.13-git])
+m4_define([orage_version], [4.11.2.14-git])
 
 m4_define([gtk_minimum_version], [2.14.0])
 m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/tz_zoneinfo_read.c b/src/tz_zoneinfo_read.c
index 4802724..c18ed44 100644
--- a/src/tz_zoneinfo_read.c
+++ b/src/tz_zoneinfo_read.c
@@ -652,7 +652,7 @@ static int check_parameters(void)
         }
         else { /* no errors */
             in_file = malloc(par_file_stat.st_size+1);
-            if (!fread(in_file, 1, par_file_stat.st_size, par_file)
+            if ((fread(in_file, 1, par_file_stat.st_size, par_file < par_file_stat.st_size))
             && (ferror(par_file))) {
                 printf("check_parameters: error reading (%s)\n"
                         , TZ_CONVERT_PAR_FILE_LOC);
@@ -805,7 +805,7 @@ static void read_os_timezones(void)
         return;
     }
     zone_tab_buf = malloc(zone_tab_file_stat.st_size+1);
-    if (!fread(zone_tab_buf, 1, zone_tab_file_stat.st_size, zone_tab_file)
+    if ((fread(zone_tab_buf, 1, zone_tab_file_stat.st_size, zone_tab_file) < zone_tab_file_stat.st_size)
     && (ferror(zone_tab_file))) {
         printf("read_os_timezones: zone.tab file read failed (%s)\n"
                 , zone_tab_file_name);
@@ -861,7 +861,7 @@ static void read_countries(void)
         return;
     }
     country_buf = malloc(country_file_stat.st_size+1);
-    if (fread(country_buf, 1, country_file_stat.st_size, country_file)
+    if ((fread(country_buf, 1, country_file_stat.st_size, country_file) < country_file_stat.st_size)
     && (ferror(country_file))) {
         printf("read_countries: iso3166.tab file read failed (%s)\n"
                 , country_file_name);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.