#1468330 (http://curl.haxx.se/bug/view.cgi?id=1468330) pointed out a bad

typecast in the curl tool leading to a crash with (64bit?) VS2005 (at least)
since the struct timeval field tv_sec is an int while time_t is 64bit.

diff --git a/CHANGES b/CHANGES
index 5954926..b77d9f9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel (11 April 2006)
+- #1468330 (http://curl.haxx.se/bug/view.cgi?id=1468330) pointed out a bad
+  typecast in the curl tool leading to a crash with (64bit?) VS2005 (at least)
+  since the struct timeval field tv_sec is an int while time_t is 64bit.
+
 Daniel (10 April 2006)
 - Ates Goral found out that if you specified both CURLOPT_CONNECTTIMEOUT and
   CURLOPT_TIMEOUT, the _longer_ time would wrongly be used for the SSL

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 332c5c4..9a5da0a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o curl --trace crash when built with VS2005
  o SSL connect time-out
  o Improved NTLM functionality
  o following redirects with more than one question mark in source URL

diff --git a/src/main.c b/src/main.c
index 4a1cec3..5b17e4f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3078,11 +3078,13 @@ int my_trace(CURL *handle, curl_infotype type,
   struct timeval tv;
   struct tm *now;
   char timebuf[20];
+  time_t secs;
 
   (void)handle; /* prevent compiler warning */
 
   tv = curlx_tvnow();
-  now = localtime((time_t *)&tv.tv_sec);  /* not multithread safe but we don't care */
+  secs = tv.tv_sec;
+  now = localtime(&secs);  /* not multithread safe but we don't care */
   if(config->tracetime)
     snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06d ",
              now->tm_hour, now->tm_min, now->tm_sec, tv.tv_usec);