perf tools: Add levenshtein ENOMEM check
PATCH 1/1 perf tools: Add levenshtein ENOMEM check
The levenshtein algorithm requires exception handling when making dynamic allocations strings.
Signed-off-by Paran Lee <[email protected]>
--- tools/perf/util/help-unknown-cmd.c | 6 +++++- tools/perf/util/levenshtein.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)
tools/perf/util/help-unknown-cmd.c +5 -1
@@ -74,10 +74,14 @@ const char *help_unknown_cmd(const char *cmd)if (main_cmds.cnt) {/* This reuses cmdname->len for similarity index */ -for (i =0 ; i < main_cmds.cnt; ++i) +for (i =0 ; i < main_cmds.cnt; ++i) { main_cmds.names[i]->len =levenshtein (cmd, main_cmds.names[i]->name,0 ,2 ,1 ,4 ); +if (main_cmds.names[i]->len == -ENOMEM ) + goto end; + } +qsort (main_cmds.names, main_cmds.cnt,sizeof (*main_cmds.names), levenshtein_compare);
tools/perf/util/levenshtein.c +10 -6
@@ -45,11 +45,17 @@ int levenshtein(const char *string1, const char *string2, int w, int s, int a, int d) { int len1 = strlen(string1), len2 = strlen(string2); -int *row0 =malloc (sizeof (int ) * (len2 +1 )); -int *row1 =malloc (sizeof (int ) * (len2 +1 )); -int *row2 =malloc (sizeof (int ) * (len2 +1 )); +int *rows, *row0, *row1, *row2;int i, j; + rows =malloc (3 *sizeof (int ) * (len2 +1 )); +if (!rows) +return -ENOMEM ; + + row0 = rows[0 ]; + row1 = rows[1 ]; + row2 = rows[2 ]; +for (j =0 ; j <= len2; j++) row1[j] = j * a;for (i =0 ; i < len1; i++) {
@@ -79,9 +85,7 @@ int levenshtein(const char *string1, const char *string2, } i = row1[len2]; -free (row0); -free (row1); -free (row2); +free (rows);return i; }
Signature · 1 line
2.34.1