From f97ca6b3339ca04477296c834a159d40d2201ccd Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Thu, 28 Sep 2017 11:47:26 +0800
Subject: vim-patch:8.0.0155

Problem:    When sorting zero elements a NULL pointer is passed to qsort(),
            which ubsan warns for.
Solution:   Don't call qsort() if there are no elements. (Dominique Pelle)

https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
---
 src/nvim/syntax.c  | 9 ++++++---
 src/nvim/version.c | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 65c0e2464a..5781424d2b 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -5845,9 +5845,12 @@ static void syntime_report(void)
     }
   }
 
-  /* sort on total time */
-  qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(time_entry_T),
-      syn_compare_syntime);
+  // Sort on total time. Skip if there are no items to avoid passing NULL
+  // pointer to qsort().
+  if (ga.ga_len > 1) {
+    qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(time_entry_T),
+          syn_compare_syntime);
+  }
 
   MSG_PUTS_TITLE(_(
           "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"));
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6b57185b50..1432a92998 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -948,7 +948,7 @@ static const int included_patches[] = {
   158,
   // 157,
   156,
-  // 155,
+  155,
   // 154,
   // 153,
   // 152 NA
-- 
cgit