patch 8.0.0155: ubsan complains about NULL pointer

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)

diff --git a/src/syntax.c b/src/syntax.c
index b2108e4d93fa0b8f3233714710d70a6e1cc46f7a..80546bb02d612b0eb65229c08fe0995c9a353423 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6704,8 +6704,10 @@ syntime_report(void)
        }
     }
 
-    /* sort on total time */
-    qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(time_entry_T),
+    /* 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/version.c b/src/version.c
index 368e6bea32a3054fe46c19ac00d5116725317abb..d88c03be7d38286c82d9d9b31e6803bb42811614 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    155,
 /**/
     154,
 /**/