(client) fix an overflow in the exponential back off code

bsergean · bsergean · commit 92db53c470bd · 2019-12-02T13:51:45.000-08:00
diff --git a/DOCKER_VERSION b/DOCKER_VERSION
@@ -1 +1 @@
-7.4.0
+7.4.1
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [7.4.1] - 2019-12-02
+
+- (client) fix an overflow in the exponential back off code
+
 ## [7.4.0] - 2019-11-25
 
 - (http client) Add support for multipart HTTP POST upload
diff --git a/ixwebsocket/IXExponentialBackoff.cpp b/ixwebsocket/IXExponentialBackoff.cpp
@@ -13,7 +13,7 @@ namespace ix
     uint32_t calculateRetryWaitMilliseconds(uint32_t retry_count,
                                             uint32_t maxWaitBetweenReconnectionRetries)
     {
-        uint32_t wait_time = std::pow(2, retry_count) * 100;
+        uint32_t wait_time = (retry_count < 26) ? (std::pow(2, retry_count) * 100) : 0;
 
         if (wait_time > maxWaitBetweenReconnectionRetries || wait_time == 0)
         {
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "7.4.0"
+#define IX_WEBSOCKET_VERSION "7.4.1"

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace ix`
`13`	`13`	`uint32_t calculateRetryWaitMilliseconds(uint32_t retry_count,`
`14`	`14`	`uint32_t maxWaitBetweenReconnectionRetries)`
`15`	`15`	`{`
`16`		`- uint32_t wait_time = std::pow(2, retry_count) * 100;`
	`16`	`+ uint32_t wait_time = (retry_count < 26) ? (std::pow(2, retry_count) * 100) : 0;`
`17`	`17`
`18`	`18`	`if (wait_time > maxWaitBetweenReconnectionRetries \|\| wait_time == 0)`
`19`	`19`	`{`