Merge pull request #14479 from omoerbeek/backport-14404-to-rec-5.0.x

rec: Backport 14404 to rec 5.0.x: Yahttp router: avoid unsigned underflow in route()
PowerDNS · Jul 18, 2024 · 543b58d · 543b58d
2 parents 1847d4a + 63afaec
commit 543b58d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/ext/yahttp/yahttp/router.cpp b/ext/yahttp/yahttp/router.cpp
@@ -63,8 +63,16 @@ namespace YaHTTP {
             while(k2 < static_cast<int>(req->url.path.size()) && req->url.path[k2] != url[k1+1]) k2++;
             pos2 = k2;
             params[pname] = funcptr::tie(pos1,pos2);
+            if (k2 > 0) {
+              k2--;
+            }
+            else {
+              // If k2 is zero, do not decrement it and then increment at bottom of loop
+              // Only increment k1 and continue loop
+              k1++;
+              continue;
+            }
           }
-          k2--;
         }
         else if (url[k1] != req->url.path[k2]) {
           break;