Instant subtraction may overflow

- ServerStat::push_score may crash when system just starts
shadowsocks · Jan 31, 2022 · 7eb76af · 7eb76af
1 parent 73ad85d
commit 7eb76af
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-rust"
-version = "1.13.0"
+version = "1.13.1"
 authors = ["Shadowsocks Contributors"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/shadowsocks/shadowsocks-rust"

diff --git a/crates/shadowsocks-service/src/local/loadbalancing/server_stat.rs b/crates/shadowsocks-service/src/local/loadbalancing/server_stat.rs
@@ -106,9 +106,8 @@ impl ServerStat {
         self.latency_queue.push_back((score, now));
 
         // Removes stats that are not in the check window
-        let windows_left = now - self.check_window;
         while let Some((_, inst)) = self.latency_queue.front() {
-            if *inst < windows_left {
+            if now - *inst > self.check_window {
                 self.latency_queue.pop_front();
             } else {
                 break;