Sophie

Sophie

distrib > Mandriva > 2010.1 > x86_64 > media > main-updates-src > by-pkgid > dec4e1edeef36e7485e13bf42f1af5da > files > 19

rpm-4.6.0-14.3mnb2.src.rpm


http://svnweb.mageia.org/packages/cauldron/rpm/current/SOURCES/rpm-4.6.0-fix-debugedit-canonicalization-error.patch?revision=343&view=co&pathrev=343

diff -Naurp rpm-4.6.0/tools/debugedit.c rpm-4.6.0.oden/tools/debugedit.c
--- rpm-4.6.0/tools/debugedit.c	2012-03-16 07:42:47.000000000 +0000
+++ rpm-4.6.0.oden/tools/debugedit.c	2012-03-16 07:43:17.000000000 +0000
@@ -638,6 +638,13 @@ edit_dwarf2_line (DSO *dso, uint32_t off
 	  shrank += srcptr - readptr;
 	  canonicalize_path ((char *)readptr, (char *)ptr);
 	  len = strlen ((char *)ptr) + 1;
+	  if (shrank - len == 1)
+	    {
+	      /* add extra '/' to avoid shrinking by one character */
+	      len++;
+	      ptr[len - 2] = '/';
+	      ptr[len - 1] = '\0';
+	    }
 	  shrank -= len;
 	  ptr += len;