diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5cd5db39b1..655ed0ec78 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -2543,11 +2543,14 @@ bool has_vim_patch(int n)
   // Perform a binary search.
   int l = 0;
   int h = (int)(ARRAY_SIZE(included_patches)) - 1;
-  while (l < h) {
+  while (true) {
     const int m = (l + h) / 2;
     if (included_patches[m] == n) {
       return true;
     }
+    if (l == h) {
+      break;
+    }
     if (included_patches[m] < n) {
       h = m;
     } else {
diff --git a/test/old/testdir/test_functions.vim b/test/old/testdir/test_functions.vim
index 4ddb3db6fa..1f0cd1f031 100644
--- a/test/old/testdir/test_functions.vim
+++ b/test/old/testdir/test_functions.vim
@@ -44,6 +44,9 @@ func Test_has()
   " Will we ever have patch 9999?
   let ver = 'patch-' .. v:version / 100 .. '.' .. v:version % 100 .. '.9999'
   call assert_equal(0, has(ver))
+
+  " There actually isn't a patch 9.0.0, but this is more consistent.
+  call assert_equal(1, has('patch-9.0.0'))
 endfunc
 
 func Test_empty()