From: Julian Seward <jseward@acm.org>
Date: Wed, 10 Feb 2010 13:37:37 +0000 (+0000)
Subject: Fix bogus comparisons of PDB vs PE timestamps, so as to avoid
X-Git-Tag: svn/VALGRIND_3_6_0~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66e628a398b03c1f1596e6186cf0c0cd95ee4cb0;p=thirdparty%2Fvalgrind.git

Fix bogus comparisons of PDB vs PE timestamps, so as to avoid
signed vs unsigned confusion.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11038
---

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index ac582d28f3..9f27d501e1 100644
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -972,7 +972,7 @@ void VG_(di_notify_pdb_debuginfo)( Int fd_obj, Addr avma_obj,
    }
    pdb_mtime = stat_buf.mtime;
 
-   if (obj_mtime - pdb_mtime > 60ULL) {
+   if (obj_mtime > pdb_mtime + 60ULL) {
       /* PDB file is older than PE file.  Really, the PDB should be
          newer than the PE, but that doesn't always seem to be the
          case.  Allow the PDB to be up to one minute older.
@@ -981,9 +981,9 @@ void VG_(di_notify_pdb_debuginfo)( Int fd_obj, Addr avma_obj,
          (b) crash.
       */
       VG_(message)(Vg_UserMsg,
-                   "Warning: Ignoring %s since it is older than %s\n",
-                   pdbname, exename);
-      goto out;
+                   "Warning:       %s (mtime = %llu)\n"
+                   " is older than %s (mtime = %llu)\n",
+                   pdbname, pdb_mtime, exename, obj_mtime);
    }
 
    sres = VG_(open)(pdbname, VKI_O_RDONLY, 0);