From e17e8a657d8ab58f5f122bb10a1fc065f6533f62 Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 19 Nov 2014 16:44:25 +0100 Subject: Pointer arithmetic fixes for end of string access Based on FR commit: 3d7fa24ca267e333d7406eff38ec02b519110ecc From: Iain Nicol Gnome bug: http://bugzilla.gnome.org/show_bug.cgi?id=651416 --- src/fr-command-7z.c | 2 +- src/fr-window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c index fbce9cf..27eb703 100644 --- a/src/fr-command-7z.c +++ b/src/fr-command-7z.c @@ -159,7 +159,7 @@ list__process_line (char *line, fdata->original_path = g_strdup (fields[1]); fdata->full_path = g_strconcat ((fdata->original_path[0] != '/') ? "/" : "", fdata->original_path, - (fdata->dir && (fdata->original_path[strlen (fdata->original_path - 1)] != '/')) ? "/" : "", + (fdata->dir && (fdata->original_path[strlen (fdata->original_path) - 1] != '/')) ? "/" : "", NULL); } else if (strcmp (fields[0], "Folder") == 0) { diff --git a/src/fr-window.c b/src/fr-window.c index e36c9d3..65e99de 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -1216,7 +1216,7 @@ fr_window_dir_exists_in_archive (FrWindow *window, return TRUE; } else if (fdata->dir - && (fdata->full_path[strlen (fdata->full_path)] != '/') + && (fdata->full_path[strlen (fdata->full_path) -1] != '/') && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) == 0)) { return TRUE; -- cgit v1.2.1