Dirk Mueller
7a839c1a47
- Fix debugedit-canon-fix.diff to handle directory table size shrinking by 1 byte correctly. OBS-URL: https://build.opensuse.org/request/show/460704 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=381
129 lines
3.7 KiB
Diff
129 lines
3.7 KiB
Diff
Index: tools/debugedit.c
|
|
===================================================================
|
|
--- tools/debugedit.c.orig 2017-02-27 13:35:18.727800856 +0100
|
|
+++ tools/debugedit.c 2017-02-27 14:22:33.975985617 +0100
|
|
@@ -162,7 +162,7 @@ strptr (DSO *dso, int sec, off_t offset)
|
|
{
|
|
if (data->d_buf
|
|
&& offset >= data->d_off
|
|
- && offset < data->d_off + data->d_size)
|
|
+ && offset < data->d_off + (off_t)data->d_size)
|
|
return (const char *) data->d_buf + (offset - data->d_off);
|
|
}
|
|
}
|
|
@@ -505,9 +505,10 @@ static int
|
|
edit_dwarf2_line (DSO *dso, uint32_t off, char *comp_dir, int phase)
|
|
{
|
|
unsigned char *ptr = debug_sections[DEBUG_LINE].data, *dir;
|
|
- unsigned char **dirt;
|
|
+ char **dirt;
|
|
unsigned char *endsec = ptr + debug_sections[DEBUG_LINE].size;
|
|
unsigned char *endcu, *endprol;
|
|
+ char line_base;
|
|
unsigned char opcode_base;
|
|
uint32_t value, dirt_cnt;
|
|
size_t comp_dir_len = !comp_dir ? 0 : strlen (comp_dir);
|
|
@@ -555,6 +556,7 @@ edit_dwarf2_line (DSO *dso, uint32_t off
|
|
return 1;
|
|
}
|
|
|
|
+ line_base = (char) (ptr[2 + (value >= 4)] & 0xff);
|
|
opcode_base = ptr[4 + (value >= 4)];
|
|
ptr = dir = ptr + 4 + (value >= 4) + opcode_base;
|
|
|
|
@@ -566,13 +568,13 @@ edit_dwarf2_line (DSO *dso, uint32_t off
|
|
++value;
|
|
}
|
|
|
|
- dirt = (unsigned char **) alloca (value * sizeof (unsigned char *));
|
|
+ dirt = (char **) alloca (value * sizeof (unsigned char *));
|
|
dirt[0] = (unsigned char *) ".";
|
|
dirt_cnt = 1;
|
|
ptr = dir;
|
|
while (*ptr != 0)
|
|
{
|
|
- dirt[dirt_cnt++] = ptr;
|
|
+ dirt[dirt_cnt++] = (char *)ptr;
|
|
ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1;
|
|
}
|
|
ptr++;
|
|
@@ -685,7 +687,7 @@ edit_dwarf2_line (DSO *dso, uint32_t off
|
|
|
|
if (dest_dir)
|
|
{
|
|
- unsigned char *srcptr, *buf = NULL;
|
|
+ char *srcptr, *buf = NULL;
|
|
size_t base_len = strlen (base_dir);
|
|
size_t dest_len = strlen (dest_dir);
|
|
size_t shrank = 0;
|
|
@@ -699,11 +701,14 @@ edit_dwarf2_line (DSO *dso, uint32_t off
|
|
ptr = dir;
|
|
}
|
|
else
|
|
- ptr = srcptr = dir;
|
|
+ {
|
|
+ ptr = dir;
|
|
+ srcptr = (char *)dir;
|
|
+ }
|
|
while (*srcptr != 0)
|
|
{
|
|
size_t len = strlen ((char *)srcptr) + 1;
|
|
- const unsigned char *readptr = srcptr;
|
|
+ const char *readptr = srcptr;
|
|
|
|
char *orig = strdup ((const char *) srcptr);
|
|
|
|
@@ -730,11 +735,18 @@ edit_dwarf2_line (DSO *dso, uint32_t off
|
|
|
|
if (shrank > 0)
|
|
{
|
|
- if (--shrank == 0)
|
|
- error (EXIT_FAILURE, 0,
|
|
- "canonicalization unexpectedly shrank by one character");
|
|
+ if (shrank == 1)
|
|
+ {
|
|
+ /* For size 1 we can't append a dummy entry as a '\0' tells
|
|
+ it the directory table ends prematurely and thus the file
|
|
+ table will end up empty. Simply append a / to the last
|
|
+ directory entry in this case. */
|
|
+ *(ptr - 1) = '/';
|
|
+ *ptr++ = '\0';
|
|
+ }
|
|
else
|
|
{
|
|
+ --shrank;
|
|
memset (ptr, 'X', shrank);
|
|
ptr += shrank;
|
|
*ptr++ = '\0';
|
|
@@ -769,21 +781,26 @@ edit_dwarf2_line (DSO *dso, uint32_t off
|
|
}
|
|
dirty_section (DEBUG_STR);
|
|
}
|
|
- else if (ptr != srcptr)
|
|
+ else if ((char *)ptr != srcptr)
|
|
memmove (ptr, srcptr, len);
|
|
srcptr += len;
|
|
ptr += len;
|
|
- dir = srcptr;
|
|
+ dir = (unsigned char *)srcptr;
|
|
read_uleb128 (srcptr);
|
|
read_uleb128 (srcptr);
|
|
read_uleb128 (srcptr);
|
|
if (ptr != dir)
|
|
- memmove (ptr, dir, srcptr - dir);
|
|
- ptr += srcptr - dir;
|
|
+ memmove (ptr, dir, (unsigned char *)srcptr - dir);
|
|
+ ptr += (unsigned char *)srcptr - dir;
|
|
}
|
|
*ptr = '\0';
|
|
free (buf);
|
|
}
|
|
+
|
|
+ ptr++;
|
|
+ /* fill the rest until the line number program starts with NOP opcode */
|
|
+ memset(ptr, opcode_base - line_base, endprol - ptr);
|
|
+ /* don't touch the line number program */
|
|
return 0;
|
|
}
|
|
|