Add debugedit-prefix.patch.

This commit is contained in:
Mark Wielaard 2017-06-28 22:24:24 +02:00
parent f04311b662
commit 6e205bd77e
2 changed files with 39 additions and 0 deletions

33
debugedit-prefix.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/tools/debugedit.c b/tools/debugedit.c
index abd2ca4..a271b91 100644
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -662,7 +662,8 @@ canonicalize_path (const char *s, char *d)
/* Returns the rest of PATH if it starts with DIR_PREFIX, skipping any
/ path separators, or NULL if PATH doesn't start with
DIR_PREFIX. Might return the empty string if PATH equals DIR_PREFIX
- (modulo trailing slashes). Never returns path starting with '/'. */
+ (modulo trailing slashes). Never returns path starting with '/'.
+ Note that DIR_PREFIX itself should NOT end with a '/'. */
static const char *
skip_dir_prefix (const char *path, const char *dir_prefix)
{
@@ -670,12 +671,17 @@ skip_dir_prefix (const char *path, const char *dir_prefix)
if (strncmp (path, dir_prefix, prefix_len) == 0)
{
path += prefix_len;
+ /* Unless path == dir_prefix there should be at least one '/'
+ in the path (which we will skip). Otherwise the path has
+ a different (longer) directory prefix. */
+ if (*path != '\0' && !IS_DIR_SEPARATOR (*path))
+ return NULL;
while (IS_DIR_SEPARATOR (path[0]))
path++;
return path;
}
- return 0;
+ return NULL;
}
/* Most strings will be in the existing debug string table. But to

View File

@ -102,6 +102,9 @@ Patch283: find-debuginfo-process-files-in-parallel.patch
Patch285: find-debuginfo-untangle-unique-build-options.patch
Patch286: debugsrc-and-sub-debuginfo-packages.patch
# debugedit check prefix match ends with slash.
Patch290: debugedit-prefix.patch
# OpenSSL backend
Patch300: 0001-Add-OpenSSL-support-for-digest-and-signatures.patch
@ -611,6 +614,9 @@ exit 0
%doc doc/librpm/html/*
%changelog
* Thu Jun 29 2017 Mark Wielaard <mjw@fedoraproject.org>
- Add debugedit-prefix.patch.
* Wed Jun 28 2017 Mark Wielaard <mjw@fedoraproject.org> - 4.13.0.1-27
- Add find-debuginfo-split-traversal-and-extraction-fix.patch (#1465170)