Feng Tu pointed out a division by zero error in the TFTP connect timeout

code for timeouts less than fice seconds, and also provided a fix for it.

diff --git a/CHANGES b/CHANGES
index d897071..7485976 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@
                              \___|\___/|_| \_\_____|
 
                                   Changelog
+Daniel S (17 May 2007)
+- Feng Tu pointed out a division by zero error in the TFTP connect timeout
+  code for timeouts less than fice seconds, and also provided a fix for it.
+
 Dan F (16 May 2007)
 - Added support for compiling under Minix 3.1.3 using ACK.
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cc9053c..a99410c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -43,6 +43,7 @@ This release includes the following bugfixes:
  o better handling of out of memory conditions
  o overwriting an uploaded file with sftp now truncates it first
  o SFTP quote commands chmod, chown, chgrp can now set a value of 0
+ o TFTP connect timouts less than 5 seconds
 
 This release includes the following known bugs:
 
@@ -67,6 +68,6 @@ advice from friends like these:
  Song Ma, Dan Fandrich, Yang Tse, Jay Austin, Robert Iakobashvil,
  James Housley, Daniel Black, Steve Little, Sonia Subramanian, Peter O'Gorman,
  Frank Hempel, Michael Wallner, Jeff Pohlmeyer, Tobias Rundström,
- Anders Gustafsson, James Bursa, Kristian Gunstone
+ Anders Gustafsson, James Bursa, Kristian Gunstone, Feng Tu
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/tftp.c b/lib/tftp.c
index 18c9472..c203f4f 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -180,6 +180,10 @@ void tftp_set_timeouts(tftp_state_data_t *state)
     /* Average restart after 5 seconds */
     state->retry_max = timeout/5;
 
+    if(state->retry_max < 1)
+      /* avoid division by zero below */
+      state->retry_max = 1;
+
     /* Compute the re-start interval to suit the timeout */
     state->retry_time = timeout/state->retry_max;
     if(state->retry_time<1)