perf string: Avoid undefined NULL+1

While the value NULL+1 is never used it triggers a ubsan warning.
Restructure and comment the loop to avoid this.

Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20241120065224.286813-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index 308fc7ec88ccd580121ada3a37ced3aecd95959d..c0e927bbadf6ff8e3a75757b375afd089a87da43 100644 (file)
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -254,11 +254,20 @@ char *strpbrk_esc(char *str, const char *stopset)
 
        do {
                ptr = strpbrk(str, stopset);
-               if (ptr == str ||
-                   (ptr == str + 1 && *(ptr - 1) != '\\'))
+               if (!ptr) {
+                       /* stopset not in str. */
                        break;
+               }
+               if (ptr == str) {
+                       /* stopset character is first in str. */
+                       break;
+               }
+               if (ptr == str + 1 && str[0] != '\\') {
+                       /* stopset chacter is second and wasn't preceded by a '\'. */
+                       break;
+               }
                str = ptr + 1;
-       } while (ptr && *(ptr - 1) == '\\' && *(ptr - 2) != '\\');
+       } while (ptr[-1] == '\\' && ptr[-2] != '\\');
 
        return ptr;
 }