diff --git a/elfutils-old-scanf-fix.diff b/elfutils-old-scanf-fix.diff index d186b00..28dfd35 100644 --- a/elfutils-old-scanf-fix.diff +++ b/elfutils-old-scanf-fix.diff @@ -1,8 +1,6 @@ -Index: src/addr2line.c -=================================================================== ---- src/addr2line.c.orig 2009-04-21 16:50:01.000000000 +0200 -+++ src/addr2line.c 2009-08-20 13:11:58.000000000 +0200 -@@ -446,11 +446,11 @@ handle_address (const char *string, Dwfl +--- src/addr2line.c-dist 2008-12-05 08:42:12.000000000 +0100 ++++ src/addr2line.c 2008-12-05 08:45:22.000000000 +0100 +@@ -373,8 +373,8 @@ handle_address (const char *string, Dwfl { bool parsed = false; int n; @@ -11,13 +9,18 @@ Index: src/addr2line.c + char name[4096]; /* FIXME */ + if (sscanf (string, "(%[^)])%" PRIiMAX "%n", name, &addr, &n) == 2 && string[n] == '\0') - parsed = adjust_to_section (name, &addr, dwfl); + { + /* It was (section)+offset. This makes sense if there is +@@ -415,7 +415,7 @@ handle_address (const char *string, Dwfl + } + } + } - else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 -+ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 ++ else if (sscanf (string, "%[^-+]%" PRIiMAX "%n", name, &addr, &n) == 2 && string[n] == '\0') { /* It was symbol+offset. */ -@@ -471,7 +471,6 @@ handle_address (const char *string, Dwfl +@@ -436,7 +436,6 @@ handle_address (const char *string, Dwfl } } diff --git a/elfutils.changes b/elfutils.changes index 42b1f1a..0694773 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 20 13:13:21 CEST 2009 - rguenther@suse.de - -- Fix elfutils-old-scanf-fix.diff patch. - ------------------------------------------------------------------- Thu Aug 13 16:11:47 CEST 2009 - tiwai@suse.de