summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-19 16:44:25 +0100
committerinfirit <[email protected]>2014-11-19 19:36:03 +0100
commite17e8a657d8ab58f5f122bb10a1fc065f6533f62 (patch)
tree92612df3a53a56992fa43d2a78d238bac90d0d93 /src
parent4951d61a5d544ac07d194194f789d6bdf6f7c835 (diff)
downloadengrampa-e17e8a657d8ab58f5f122bb10a1fc065f6533f62.tar.bz2
engrampa-e17e8a657d8ab58f5f122bb10a1fc065f6533f62.tar.xz
Pointer arithmetic fixes for end of string access
Based on FR commit: 3d7fa24ca267e333d7406eff38ec02b519110ecc From: Iain Nicol <[email protected]> Gnome bug: http://bugzilla.gnome.org/show_bug.cgi?id=651416
Diffstat (limited to 'src')
-rw-r--r--src/fr-command-7z.c2
-rw-r--r--src/fr-window.c2
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;