* [gentoo-commits] gentoo-x86 commit in app-arch/file-roller/files: file-roller-3.0.2-pointer-arithmetic.patch
@ 2011-08-19 15:41 Nirbheek Chauhan (nirbheek)
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-08-19 15:41 UTC (permalink / raw
To: gentoo-commits
nirbheek 11/08/19 15:41:36
Added: file-roller-3.0.2-pointer-arithmetic.patch
Log:
Bump to 3.0.2, from gnome overlay for GNOME 3
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.1 app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch?rev=1.1&content-type=text/plain
Index: file-roller-3.0.2-pointer-arithmetic.patch
===================================================================
From 3d7fa24ca267e333d7406eff38ec02b519110ecc Mon Sep 17 00:00:00 2001
From: Iain Nicol <iainn@src.gnome.org>
Date: Sun, 29 May 2011 21:50:58 +0000
Subject: Pointer arithmetic fixes for end of string access
[bug #651416]
---
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index 3f66338..5e505fa 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -158,7 +158,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 743c8fe..db8c8c6 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -1236,7 +1236,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 v0.9
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-19 15:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 15:41 [gentoo-commits] gentoo-x86 commit in app-arch/file-roller/files: file-roller-3.0.2-pointer-arithmetic.patch Nirbheek Chauhan (nirbheek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox