rpms
/
gdb
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing dumb thing that I did while including the SystemTap patch.

This commit is contained in:
Sergio Durigan Junior 2012-03-01 16:44:11 -03:00
parent b3beac1a00
commit 815858a515
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gdb-stap-corrupt-probes-fix.patch
View File

@ -48,3 +48,28 @@ Index: gdb-7.3.50.20110722/gdb/elfread.c
@@ -2650,15 +2651,19 @@
if (ret->name)
{
ret->args = memchr (ret->name, '\0',
- (unsigned long *) el->data
- + el->size - (unsigned long *) ret->name);
+ (char *) el->data + el->size - ret->name);
- if (ret->args++ != NULL
- || memchr (ret->args, '\0', (unsigned long *) el->data
- + el->size - (unsigned long *) ret->name)
- != el->data + el->size - 1)
- complaint (&symfile_complaints, _("corrupt probe when reading `%s'"),
- objfile->name);
+ if (ret->args != NULL)
+ ++ret->args;
+ if (ret->args == NULL
+ || (memchr (ret->args, '\0',
+ (char *) el->data + el->size - ret->name)
+ != el->data + el->size - 1))
+ {
+ complaint (&symfile_complaints, _("corrupt probe when reading `%s'"),
+ objfile->name);
+ ret->args = NULL;
+ }
}
else
ret->args = NULL;

1
gdb.spec
View File

@ -842,6 +842,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
%if 0%{?rhel:1} && 0%{?rhel} <= 6
%patch487 -p1
%endif # 0%{?rhel:1} && 0%{?rhel} <= 6
%patch647 -p1
find -name "*.orig" | xargs rm -f
! find -name "*.rej" # Should not happen.