]>
Commit | Line | Data |
---|---|---|
c7f5889b JB |
1 | --- elfutils-0.137/src/addr2line.c.orig 2008-08-09 06:06:44.000000000 +0200 |
2 | +++ elfutils-0.137/src/addr2line.c 2008-09-09 22:15:16.304992337 +0200 | |
0f5a32a6 | 3 | @@ -437,6 +437,12 @@ |
4 | return false; | |
5 | } | |
6 | ||
7 | +#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 7) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 3) | |
8 | +# define SCANF_ADDR "%m" | |
9 | +#else | |
10 | +# define SCANF_ADDR "%a" | |
11 | +#endif | |
12 | + | |
13 | static int | |
14 | handle_address (const char *string, Dwfl *dwfl) | |
15 | { | |
16 | @@ -447,10 +453,10 @@ | |
c7f5889b JB |
17 | bool parsed = false; |
18 | int n; | |
19 | char *name = NULL; | |
0f5a32a6 | 20 | - if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2 |
21 | + if (sscanf (string, "(" SCANF_ADDR "[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2 | |
c7f5889b | 22 | && string[n] == '\0') |
0f5a32a6 | 23 | parsed = adjust_to_section (name, &addr, dwfl); |
24 | - else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 | |
25 | + else if (sscanf (string, SCANF_ADDR "[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 | |
c7f5889b | 26 | && string[n] == '\0') |
c7f5889b JB |
27 | { |
28 | /* It was symbol+offset. */ |